commit 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7
author Ben Murdoch <benm@google.com> Thu Nov 25 19:40:10 2010 +0000
committer Ben Murdoch <benm@google.com> Fri Dec 03 13:52:53 2010 +0000
tree 938665d93a11fe7a6d0124e3c1e020d1f9d3f947
parent 7c627d87728a355737862918d144f98f69406954

Merge Chromium at r66597: Initial merge by git.

Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b

chrome/browser/extensions/extension_omnibox_api.h

diff --git a/chrome/browser/extensions/extension_omnibox_api.h b/chrome/browser/extensions/extension_omnibox_api.h
index 9d0dc99..7c4d44c 100644
--- a/chrome/browser/extensions/extension_omnibox_api.h
+++ b/chrome/browser/extensions/extension_omnibox_api.h
@@ -42,13 +42,17 @@
 class OmniboxSendSuggestionsFunction : public SyncExtensionFunction {
  public:
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.omnibox.sendSuggestions");
+  DECLARE_EXTENSION_FUNCTION_NAME("omnibox.sendSuggestions");
 };
 
 struct ExtensionOmniboxSuggestion {
   ExtensionOmniboxSuggestion();
   ~ExtensionOmniboxSuggestion();
 
+  // Converts a list of style ranges from the extension into the format expected
+  // by the autocomplete system.
+  bool ReadStylesFromValue(const ListValue& value);
+
   // The text that gets put in the edit box.
   string16 content;