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

Unified Diff: trunk/src/chrome/browser/ui/search/instant_controller.h

Issue 135903002: Revert 244407 "InstantExtended: remove dead code related to the ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/search/instant_controller.h
===================================================================
--- trunk/src/chrome/browser/ui/search/instant_controller.h (revision 244428)
+++ trunk/src/chrome/browser/ui/search/instant_controller.h (working copy)
@@ -116,9 +116,18 @@
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn);
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited);
+ FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded);
+ FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab);
+ FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab);
+ FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPForWrongProvider);
+ FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPRenderProcessGone);
+ FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
+ PreloadedNTPDoesntSupportInstant);
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation);
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance);
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged);
+ FRIEND_TEST_ALL_PREFIXES(InstantExtendedNetworkTest,
+ NTPReactsToNetworkChanges);
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
AcceptingURLSearchDoesNotNavigate);
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, AcceptingJSSearchDoesNotRunJS);
@@ -145,6 +154,7 @@
virtual void InstantPageAboutToNavigateMainFrame(
const content::WebContents* contents,
const GURL& url) OVERRIDE;
+ virtual void InstantPageLoadFailed(content::WebContents* contents) OVERRIDE;
// Helper function to navigate the given contents to the local fallback
// Instant URL and trim the history correctly.
« no previous file with comments | « trunk/src/chrome/browser/ui/browser_navigator.cc ('k') | trunk/src/chrome/browser/ui/search/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698