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

Side by Side Diff: chrome/browser/ui/search/instant_controller.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_INSTANT_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 109 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
110 TypedSearchURLDoesntReuseInstantTab); 110 TypedSearchURLDoesntReuseInstantTab);
111 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 111 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
112 DispatchMVChangeEventWhileNavigatingBackToNTP); 112 DispatchMVChangeEventWhileNavigatingBackToNTP);
113 113
114 // Overridden from InstantPage::Delegate: 114 // Overridden from InstantPage::Delegate:
115 // TODO(shishir): We assume that the WebContent's current RenderViewHost is 115 // TODO(shishir): We assume that the WebContent's current RenderViewHost is
116 // the RenderViewHost being created which is not always true. Fix this. 116 // the RenderViewHost being created which is not always true. Fix this.
117 virtual void InstantSupportDetermined( 117 virtual void InstantSupportDetermined(
118 const content::WebContents* contents, 118 const content::WebContents* contents,
119 bool supports_instant) OVERRIDE; 119 bool supports_instant) override;
120 virtual void InstantPageAboutToNavigateMainFrame( 120 virtual void InstantPageAboutToNavigateMainFrame(
121 const content::WebContents* contents, 121 const content::WebContents* contents,
122 const GURL& url) OVERRIDE; 122 const GURL& url) override;
123 123
124 // Helper function to navigate the given contents to the local fallback 124 // Helper function to navigate the given contents to the local fallback
125 // Instant URL and trim the history correctly. 125 // Instant URL and trim the history correctly.
126 void RedirectToLocalNTP(content::WebContents* contents); 126 void RedirectToLocalNTP(content::WebContents* contents);
127 127
128 // Helper for OmniboxFocusChanged. Commit or discard the overlay. 128 // Helper for OmniboxFocusChanged. Commit or discard the overlay.
129 void OmniboxLostFocus(gfx::NativeView view_gaining_focus); 129 void OmniboxLostFocus(gfx::NativeView view_gaining_focus);
130 130
131 // If the active tab is an Instant search results page, sets |instant_tab_| to 131 // If the active tab is an Instant search results page, sets |instant_tab_| to
132 // point to it. Else, deletes any existing |instant_tab_|. 132 // point to it. Else, deletes any existing |instant_tab_|.
(...skipping 13 matching lines...) Expand all
146 // The search model mode for the active tab. 146 // The search model mode for the active tab.
147 SearchMode search_mode_; 147 SearchMode search_mode_;
148 148
149 // List of events and their timestamps, useful in debugging Instant behaviour. 149 // List of events and their timestamps, useful in debugging Instant behaviour.
150 mutable std::list<std::pair<int64, std::string> > debug_events_; 150 mutable std::list<std::pair<int64, std::string> > debug_events_;
151 151
152 DISALLOW_COPY_AND_ASSIGN(InstantController); 152 DISALLOW_COPY_AND_ASSIGN(InstantController);
153 }; 153 };
154 154
155 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ 155 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698