Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / autocomplete / shortcuts_provider.h

diff --git a/src/chrome/browser/autocomplete/shortcuts_provider.h b/src/chrome/browser/autocomplete/shortcuts_provider.h
index df69d37..53a42dd 100644 (file)
--- a/src/chrome/browser/autocomplete/shortcuts_provider.h
+++ b/src/chrome/browser/autocomplete/shortcuts_provider.h
@@ -10,8 +10,8 @@
 #include <string>
 
 #include "base/gtest_prod_util.h"
-#include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/shortcuts_backend.h"
+#include "components/omnibox/autocomplete_provider.h"
 
 class Profile;
 class ShortcutsProviderTest;
@@ -24,7 +24,7 @@ class ShortcutsProvider
     : public AutocompleteProvider,
       public ShortcutsBackend::ShortcutsBackendObserver {
  public:
-  ShortcutsProvider(AutocompleteProviderListener* listener, Profile* profile);
+  explicit ShortcutsProvider(Profile* profile);
 
   // Performs the autocompletion synchronously. Since no asynch completion is
   // performed |minimal_changes| is ignored.
@@ -50,15 +50,14 @@ class ShortcutsProvider
 
   // Returns an AutocompleteMatch corresponding to |shortcut|. Assigns it
   // |relevance| score in the process, and highlights the description and
-  // contents against |input|, which should be the lower-cased version
-  // of the user's input. |input|, |fixed_up_input_text|, and
-  // |input_as_gurl| are used to decide what can be inlined.
+  // contents against |input|, which should be the lower-cased version of
+  // the user's input. |input| and |fixed_up_input_text| are used to decide
+  // what can be inlined.
   AutocompleteMatch ShortcutToACMatch(
       const history::ShortcutsDatabase::Shortcut& shortcut,
       int relevance,
       const AutocompleteInput& input,
-      const base::string16& fixed_up_input_text,
-      const GURL& input_as_gurl);
+      const base::string16& fixed_up_input_text);
 
   // Returns a map mapping characters to groups of words from |text| that start
   // with those characters, ordered lexicographically descending so that longer
@@ -105,6 +104,7 @@ class ShortcutsProvider
   // The default max relevance unless overridden by a field trial.
   static const int kShortcutsProviderDefaultMaxRelevance;
 
+  Profile* profile_;
   std::string languages_;
   bool initialized_;
 };