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

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

Issue 1428423002: Remove setVoiceSearchSupported part of EmbeddedSearch SearchBox API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 void Submit(const base::string16& text, 84 void Submit(const base::string16& text,
85 const EmbeddedSearchRequestParams& params); 85 const EmbeddedSearchRequestParams& params);
86 86
87 // Called when the tab corresponding to |this| instance is activated. 87 // Called when the tab corresponding to |this| instance is activated.
88 void OnTabActivated(); 88 void OnTabActivated();
89 89
90 // Called when the tab corresponding to |this| instance is deactivated. 90 // Called when the tab corresponding to |this| instance is deactivated.
91 void OnTabDeactivated(); 91 void OnTabDeactivated();
92 92
93 // Tells the page to toggle voice search. 93 // Tells the page to toggle voice search.
94 void ToggleVoiceSearch(); 94 void ToggleVoiceSearch();
msw 2015/11/06 23:59:23 Should this also be removed?
Evan Stade 2015/11/07 00:43:03 Done.
95 95
96 // Returns true if the underlying page is a search results page. 96 // Returns true if the underlying page is a search results page.
97 bool IsSearchResultsPage(); 97 bool IsSearchResultsPage();
98 98
99 void set_delegate(SearchTabHelperDelegate* delegate) { delegate_ = delegate; } 99 void set_delegate(SearchTabHelperDelegate* delegate) { delegate_ = delegate; }
100 100
101 private: 101 private:
102 friend class content::WebContentsUserData<SearchTabHelper>; 102 friend class content::WebContentsUserData<SearchTabHelper>;
103 friend class InstantPageTest; 103 friend class InstantPageTest;
104 friend class SearchIPCRouterPolicyTest; 104 friend class SearchIPCRouterPolicyTest;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 void DidNavigateMainFrame( 151 void DidNavigateMainFrame(
152 const content::LoadCommittedDetails& details, 152 const content::LoadCommittedDetails& details,
153 const content::FrameNavigateParams& params) override; 153 const content::FrameNavigateParams& params) override;
154 void DidFinishLoad(content::RenderFrameHost* render_frame_host, 154 void DidFinishLoad(content::RenderFrameHost* render_frame_host,
155 const GURL& validated_url) override; 155 const GURL& validated_url) override;
156 void NavigationEntryCommitted( 156 void NavigationEntryCommitted(
157 const content::LoadCommittedDetails& load_details) override; 157 const content::LoadCommittedDetails& load_details) override;
158 158
159 // Overridden from SearchIPCRouter::Delegate: 159 // Overridden from SearchIPCRouter::Delegate:
160 void OnInstantSupportDetermined(bool supports_instant) override; 160 void OnInstantSupportDetermined(bool supports_instant) override;
161 void OnSetVoiceSearchSupport(bool supports_voice_search) override;
162 void FocusOmnibox(OmniboxFocusState state) override; 161 void FocusOmnibox(OmniboxFocusState state) override;
163 void NavigateToURL(const GURL& url, 162 void NavigateToURL(const GURL& url,
164 WindowOpenDisposition disposition, 163 WindowOpenDisposition disposition,
165 bool is_most_visited_item_url) override; 164 bool is_most_visited_item_url) override;
166 void OnDeleteMostVisitedItem(const GURL& url) override; 165 void OnDeleteMostVisitedItem(const GURL& url) override;
167 void OnUndoMostVisitedDeletion(const GURL& url) override; 166 void OnUndoMostVisitedDeletion(const GURL& url) override;
168 void OnUndoAllMostVisitedDeletions() override; 167 void OnUndoAllMostVisitedDeletions() override;
169 void OnLogEvent(NTPLoggingEventType event, base::TimeDelta time) override; 168 void OnLogEvent(NTPLoggingEventType event, base::TimeDelta time) override;
170 void OnLogMostVisitedImpression(int position, 169 void OnLogMostVisitedImpression(int position,
171 const base::string16& provider) override; 170 const base::string16& provider) override;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 SearchTabHelperDelegate* delegate_; 227 SearchTabHelperDelegate* delegate_;
229 228
230 // Function to check if the omnibox has focus. Tests use this to modify the 229 // Function to check if the omnibox has focus. Tests use this to modify the
231 // default behavior. 230 // default behavior.
232 OmniboxHasFocusFn omnibox_has_focus_fn_; 231 OmniboxHasFocusFn omnibox_has_focus_fn_;
233 232
234 DISALLOW_COPY_AND_ASSIGN(SearchTabHelper); 233 DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
235 }; 234 };
236 235
237 #endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_ 236 #endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698