Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: chrome/browser/ui/search/search_tab_helper.h

Issue 741593003: Merge: Propagate the search request params from the browser to the Instant search base page to fix … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2214
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
6 #define CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_ 6 #define CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 void InstantSupportChanged(bool supports_instant); 73 void InstantSupportChanged(bool supports_instant);
74 74
75 // Returns true if the page supports instant. If the instant support state is 75 // Returns true if the page supports instant. If the instant support state is
76 // not determined or if the page does not support instant returns false. 76 // not determined or if the page does not support instant returns false.
77 bool SupportsInstant() const; 77 bool SupportsInstant() const;
78 78
79 // Sends the current SearchProvider suggestion to the Instant page if any. 79 // Sends the current SearchProvider suggestion to the Instant page if any.
80 void SetSuggestionToPrefetch(const InstantSuggestion& suggestion); 80 void SetSuggestionToPrefetch(const InstantSuggestion& suggestion);
81 81
82 // Tells the page that the user pressed Enter in the omnibox. 82 // Tells the page that the user pressed Enter in the omnibox.
83 void Submit(const base::string16& text); 83 void Submit(const base::string16& text,
84 const EmbeddedSearchRequestParams& params);
84 85
85 // Called when the tab corresponding to |this| instance is activated. 86 // Called when the tab corresponding to |this| instance is activated.
86 void OnTabActivated(); 87 void OnTabActivated();
87 88
88 // Called when the tab corresponding to |this| instance is deactivated. 89 // Called when the tab corresponding to |this| instance is deactivated.
89 void OnTabDeactivated(); 90 void OnTabDeactivated();
90 91
91 // Tells the page to toggle voice search. 92 // Tells the page to toggle voice search.
92 void ToggleVoiceSearch(); 93 void ToggleVoiceSearch();
93 94
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 SearchTabHelperDelegate* delegate_; 233 SearchTabHelperDelegate* delegate_;
233 234
234 // Function to check if the omnibox has focus. Tests use this to modify the 235 // Function to check if the omnibox has focus. Tests use this to modify the
235 // default behavior. 236 // default behavior.
236 OmniboxHasFocusFn omnibox_has_focus_fn_; 237 OmniboxHasFocusFn omnibox_has_focus_fn_;
237 238
238 DISALLOW_COPY_AND_ASSIGN(SearchTabHelper); 239 DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
239 }; 240 };
240 241
241 #endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_ 242 #endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/search_ipc_router_unittest.cc ('k') | chrome/browser/ui/search/search_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698