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

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

Issue 132733002: InstantExtended: remove dead code related to the non-cacheable NTP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 6 years, 11 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 | Annotate | Revision Log
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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded); 119 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded);
120 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab); 120 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab);
121 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab); 121 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab);
122 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPForWrongProvider); 122 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPForWrongProvider);
123 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPRenderProcessGone); 123 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPRenderProcessGone);
124 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 124 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
125 PreloadedNTPDoesntSupportInstant); 125 PreloadedNTPDoesntSupportInstant);
126 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); 126 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation);
127 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); 127 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance);
128 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged); 128 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged);
129 FRIEND_TEST_ALL_PREFIXES(InstantExtendedNetworkTest,
130 NTPReactsToNetworkChanges);
131 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 129 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
132 AcceptingURLSearchDoesNotNavigate); 130 AcceptingURLSearchDoesNotNavigate);
133 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, AcceptingJSSearchDoesNotRunJS); 131 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, AcceptingJSSearchDoesNotRunJS);
134 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 132 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
135 ReloadSearchAfterBackReloadsCorrectQuery); 133 ReloadSearchAfterBackReloadsCorrectQuery);
136 FRIEND_TEST_ALL_PREFIXES(InstantExtendedFirstTabTest, 134 FRIEND_TEST_ALL_PREFIXES(InstantExtendedFirstTabTest,
137 RedirectToLocalOnLoadFailure); 135 RedirectToLocalOnLoadFailure);
138 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch); 136 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch);
139 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, HomeButtonAffectsMargin); 137 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, HomeButtonAffectsMargin);
140 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab); 138 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab);
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 // its suggestions with the omnibox. 193 // its suggestions with the omnibox.
196 gfx::Rect omnibox_bounds_; 194 gfx::Rect omnibox_bounds_;
197 195
198 // List of events and their timestamps, useful in debugging Instant behaviour. 196 // List of events and their timestamps, useful in debugging Instant behaviour.
199 mutable std::list<std::pair<int64, std::string> > debug_events_; 197 mutable std::list<std::pair<int64, std::string> > debug_events_;
200 198
201 DISALLOW_COPY_AND_ASSIGN(InstantController); 199 DISALLOW_COPY_AND_ASSIGN(InstantController);
202 }; 200 };
203 201
204 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ 202 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698