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

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

Issue 17413017: InstantExtended: Don't create overlay. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/ui/search/instant_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 UNIT_F(IsJavascriptEnabled); 273 UNIT_F(IsJavascriptEnabled);
274 UNIT_F(IsJavascriptEnabledChecksContentSettings); 274 UNIT_F(IsJavascriptEnabledChecksContentSettings);
275 UNIT_F(IsJavascriptEnabledChecksPrefs); 275 UNIT_F(IsJavascriptEnabledChecksPrefs);
276 UNIT_F(PrefersRemoteNTPOnStartup); 276 UNIT_F(PrefersRemoteNTPOnStartup);
277 UNIT_F(ShouldSwitchToLocalOverlay); 277 UNIT_F(ShouldSwitchToLocalOverlay);
278 UNIT_F(SwitchesToLocalNTPIfJSDisabled); 278 UNIT_F(SwitchesToLocalNTPIfJSDisabled);
279 UNIT_F(SwitchesToLocalNTPIfNoInstantSupport); 279 UNIT_F(SwitchesToLocalNTPIfNoInstantSupport);
280 UNIT_F(SwitchesToLocalNTPIfNoNTPReady); 280 UNIT_F(SwitchesToLocalNTPIfNoNTPReady);
281 UNIT_F(SwitchesToLocalNTPIfPathBad); 281 UNIT_F(SwitchesToLocalNTPIfPathBad);
282 #undef UNIT_F 282 #undef UNIT_F
283 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
284 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UsesOverlayIfTabNotReady);
285 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
286 SearchQueryNotDisplayedForNavsuggest);
287 FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL);
288 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
289 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh);
290 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefreshDifferentOrder);
291 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantRenderViewGone);
292 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); 283 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn);
293 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); 284 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited);
294 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, RestrictedItemReadback);
295 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant);
296 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
297 OmniboxTextUponFocusedCommittedSERP);
298 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
299 NavigationSuggestionIsDiscardedUponSearchSuggestion);
300 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
301 NavigateToURLSuggestionHitEnterAndLookForSubmit);
302 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
303 MiddleClickOnSuggestionOpensInNewTab);
304 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchProviderRunsForFallback);
305 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded); 285 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded);
306 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab); 286 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab);
307 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab); 287 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab);
308 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPForWrongProvider); 288 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPForWrongProvider);
309 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPRenderViewGone); 289 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPRenderViewGone);
310 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 290 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
311 PreloadedNTPDoesntSupportInstant); 291 PreloadedNTPDoesntSupportInstant);
312 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); 292 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation);
313 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); 293 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance);
314 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ValidatesSuggestions);
315 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
316 OmniboxCommitsWhenShownFullHeight);
317 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, LocalOnlyNTPIsPreloaded); 294 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, LocalOnlyNTPIsPreloaded);
318 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, LocalOnlyNTPIsNotPreloaded); 295 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, LocalOnlyNTPIsNotPreloaded);
319 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OverlayRenderViewGone);
320 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OverlayDoesntSupportInstant);
321 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest,
322 MANUAL_OmniboxFocusLoadsInstant);
323 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest,
324 MANUAL_BackspaceFromQueryToSelectedUrlAndNavigate);
325 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged); 296 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged);
326 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchProviderForLocalNTP);
327 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 297 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
328 AcceptingURLSearchDoesNotNavigate); 298 AcceptingURLSearchDoesNotNavigate);
329 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, AcceptingJSSearchDoesNotRunJS); 299 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, AcceptingJSSearchDoesNotRunJS);
330 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 300 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
331 ReloadSearchAfterBackReloadsCorrectQuery); 301 ReloadSearchAfterBackReloadsCorrectQuery);
332 FRIEND_TEST_ALL_PREFIXES( 302 FRIEND_TEST_ALL_PREFIXES(InstantExtendedFirstTabTest,
333 InstantExtendedFirstTabTest, RedirectToLocalOnLoadFailure); 303 RedirectToLocalOnLoadFailure);
334 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, LogDropdownShown);
335 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
336 OverlayDoesNotEchoSearchProviderNavsuggest);
337 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch); 304 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch);
338 #if !defined(HTML_INSTANT_EXTENDED_POPUP) 305 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, HomeButtonAffectsMargin);
339 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab); 306 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab);
340 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 307 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
341 SearchDoesntReuseInstantTabWithoutSupport); 308 SearchDoesntReuseInstantTabWithoutSupport);
342 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 309 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
343 TypedSearchURLDoesntReuseInstantTab); 310 TypedSearchURLDoesntReuseInstantTab);
344 #endif
345 311
346 // Overridden from InstantPage::Delegate: 312 // Overridden from InstantPage::Delegate:
347 // TODO(shishir): We assume that the WebContent's current RenderViewHost is 313 // TODO(shishir): We assume that the WebContent's current RenderViewHost is
348 // the RenderViewHost being created which is not always true. Fix this. 314 // the RenderViewHost being created which is not always true. Fix this.
349 virtual void InstantPageRenderViewCreated( 315 virtual void InstantPageRenderViewCreated(
350 const content::WebContents* contents) OVERRIDE; 316 const content::WebContents* contents) OVERRIDE;
351 virtual void InstantSupportDetermined( 317 virtual void InstantSupportDetermined(
352 const content::WebContents* contents, 318 const content::WebContents* contents,
353 bool supports_instant) OVERRIDE; 319 bool supports_instant) OVERRIDE;
354 virtual void InstantPageRenderViewGone( 320 virtual void InstantPageRenderViewGone(
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. 531 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
566 bool allow_overlay_to_show_search_suggestions_; 532 bool allow_overlay_to_show_search_suggestions_;
567 533
568 // List of events and their timestamps, useful in debugging Instant behaviour. 534 // List of events and their timestamps, useful in debugging Instant behaviour.
569 mutable std::list<std::pair<int64, std::string> > debug_events_; 535 mutable std::list<std::pair<int64, std::string> > debug_events_;
570 536
571 DISALLOW_COPY_AND_ASSIGN(InstantController); 537 DISALLOW_COPY_AND_ASSIGN(InstantController);
572 }; 538 };
573 539
574 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ 540 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/search/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698