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

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

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 FRIEND_TEST_ALL_PREFIXES(InstantPageTest, 135 FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
136 DetermineIfPageSupportsInstant_NonLocal); 136 DetermineIfPageSupportsInstant_NonLocal);
137 FRIEND_TEST_ALL_PREFIXES(InstantPageTest, 137 FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
138 PageURLDoesntBelongToInstantRenderer); 138 PageURLDoesntBelongToInstantRenderer);
139 FRIEND_TEST_ALL_PREFIXES(InstantPageTest, PageSupportsInstant); 139 FRIEND_TEST_ALL_PREFIXES(InstantPageTest, PageSupportsInstant);
140 140
141 explicit SearchTabHelper(content::WebContents* web_contents); 141 explicit SearchTabHelper(content::WebContents* web_contents);
142 142
143 // Overridden from contents::WebContentsObserver: 143 // Overridden from contents::WebContentsObserver:
144 virtual void RenderViewCreated( 144 virtual void RenderViewCreated(
145 content::RenderViewHost* render_view_host) OVERRIDE; 145 content::RenderViewHost* render_view_host) override;
146 virtual void DidStartNavigationToPendingEntry( 146 virtual void DidStartNavigationToPendingEntry(
147 const GURL& url, 147 const GURL& url,
148 content::NavigationController::ReloadType reload_type) OVERRIDE; 148 content::NavigationController::ReloadType reload_type) override;
149 virtual void DidNavigateMainFrame( 149 virtual void DidNavigateMainFrame(
150 const content::LoadCommittedDetails& details, 150 const content::LoadCommittedDetails& details,
151 const content::FrameNavigateParams& params) OVERRIDE; 151 const content::FrameNavigateParams& params) override;
152 virtual void DidFailProvisionalLoad( 152 virtual void DidFailProvisionalLoad(
153 content::RenderFrameHost* render_frame_host, 153 content::RenderFrameHost* render_frame_host,
154 const GURL& validated_url, 154 const GURL& validated_url,
155 int error_code, 155 int error_code,
156 const base::string16& error_description) OVERRIDE; 156 const base::string16& error_description) override;
157 virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host, 157 virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
158 const GURL& validated_url) OVERRIDE; 158 const GURL& validated_url) override;
159 virtual void NavigationEntryCommitted( 159 virtual void NavigationEntryCommitted(
160 const content::LoadCommittedDetails& load_details) OVERRIDE; 160 const content::LoadCommittedDetails& load_details) override;
161 161
162 // Overridden from SearchIPCRouter::Delegate: 162 // Overridden from SearchIPCRouter::Delegate:
163 virtual void OnInstantSupportDetermined(bool supports_instant) OVERRIDE; 163 virtual void OnInstantSupportDetermined(bool supports_instant) override;
164 virtual void OnSetVoiceSearchSupport(bool supports_voice_search) OVERRIDE; 164 virtual void OnSetVoiceSearchSupport(bool supports_voice_search) override;
165 virtual void FocusOmnibox(OmniboxFocusState state) OVERRIDE; 165 virtual void FocusOmnibox(OmniboxFocusState state) override;
166 virtual void NavigateToURL(const GURL& url, 166 virtual void NavigateToURL(const GURL& url,
167 WindowOpenDisposition disposition, 167 WindowOpenDisposition disposition,
168 bool is_most_visited_item_url) OVERRIDE; 168 bool is_most_visited_item_url) override;
169 virtual void OnDeleteMostVisitedItem(const GURL& url) OVERRIDE; 169 virtual void OnDeleteMostVisitedItem(const GURL& url) override;
170 virtual void OnUndoMostVisitedDeletion(const GURL& url) OVERRIDE; 170 virtual void OnUndoMostVisitedDeletion(const GURL& url) override;
171 virtual void OnUndoAllMostVisitedDeletions() OVERRIDE; 171 virtual void OnUndoAllMostVisitedDeletions() override;
172 virtual void OnLogEvent(NTPLoggingEventType event) OVERRIDE; 172 virtual void OnLogEvent(NTPLoggingEventType event) override;
173 virtual void OnLogMostVisitedImpression( 173 virtual void OnLogMostVisitedImpression(
174 int position, const base::string16& provider) OVERRIDE; 174 int position, const base::string16& provider) override;
175 virtual void OnLogMostVisitedNavigation( 175 virtual void OnLogMostVisitedNavigation(
176 int position, const base::string16& provider) OVERRIDE; 176 int position, const base::string16& provider) override;
177 virtual void PasteIntoOmnibox(const base::string16& text) OVERRIDE; 177 virtual void PasteIntoOmnibox(const base::string16& text) override;
178 virtual void OnChromeIdentityCheck(const base::string16& identity) OVERRIDE; 178 virtual void OnChromeIdentityCheck(const base::string16& identity) override;
179 179
180 // Overridden from InstantServiceObserver: 180 // Overridden from InstantServiceObserver:
181 virtual void ThemeInfoChanged(const ThemeBackgroundInfo& theme_info) OVERRIDE; 181 virtual void ThemeInfoChanged(const ThemeBackgroundInfo& theme_info) override;
182 virtual void MostVisitedItemsChanged( 182 virtual void MostVisitedItemsChanged(
183 const std::vector<InstantMostVisitedItem>& items) OVERRIDE; 183 const std::vector<InstantMostVisitedItem>& items) override;
184 virtual void OmniboxStartMarginChanged(int omnibox_start_margin) OVERRIDE; 184 virtual void OmniboxStartMarginChanged(int omnibox_start_margin) override;
185 185
186 // Sets the mode of the model based on the current URL of web_contents(). 186 // Sets the mode of the model based on the current URL of web_contents().
187 // Only updates the origin part of the mode if |update_origin| is true, 187 // Only updates the origin part of the mode if |update_origin| is true,
188 // otherwise keeps the current origin. If |is_preloaded_ntp| is true, the mode 188 // otherwise keeps the current origin. If |is_preloaded_ntp| is true, the mode
189 // is set to NTP regardless of the current URL; this is used to ensure that 189 // is set to NTP regardless of the current URL; this is used to ensure that
190 // InstantController can bind InstantTab to new tab pages immediately. 190 // InstantController can bind InstantTab to new tab pages immediately.
191 void UpdateMode(bool update_origin, bool is_preloaded_ntp); 191 void UpdateMode(bool update_origin, bool is_preloaded_ntp);
192 192
193 // Tells the renderer to determine if the page supports the Instant API, which 193 // Tells the renderer to determine if the page supports the Instant API, which
194 // results in a call to OnInstantSupportDetermined() when the reply is 194 // results in a call to OnInstantSupportDetermined() when the reply is
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 SearchTabHelperDelegate* delegate_; 234 SearchTabHelperDelegate* delegate_;
235 235
236 // Function to check if the omnibox has focus. Tests use this to modify the 236 // Function to check if the omnibox has focus. Tests use this to modify the
237 // default behavior. 237 // default behavior.
238 OmniboxHasFocusFn omnibox_has_focus_fn_; 238 OmniboxHasFocusFn omnibox_has_focus_fn_;
239 239
240 DISALLOW_COPY_AND_ASSIGN(SearchTabHelper); 240 DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
241 }; 241 };
242 242
243 #endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_ 243 #endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/search_model_unittest.cc ('k') | chrome/browser/ui/search/search_tab_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698