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

Unified Diff: chrome/browser/search/search.cc

Issue 14043009: Fall back to local page if online NTP fails to load. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix failing unittest & address comments Created 7 years, 7 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/search/instant_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search/search.cc
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 74e0058fcbe571b42fdc03681d18ceecb63b2cab..0fe9b23d049dd13bb24bc2ac3f5fb5a3255ff311 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -485,11 +485,12 @@ bool ShouldPreferRemoteNTPOnStartup() {
// precedence and allows the trial to not be reported (if it's never queried).
const CommandLine* command_line = CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kDisableInstantExtendedAPI) ||
- command_line->HasSwitch(switches::kEnableInstantExtendedAPI) ||
command_line->HasSwitch(switches::kEnableLocalOnlyInstantExtendedAPI) ||
- command_line->HasSwitch(switches::kDisableLocalOnlyInstantExtendedAPI)) {
+ command_line->HasSwitch(switches::kEnableLocalFirstLoadNTP)) {
return false;
}
+ if (command_line->HasSwitch(switches::kDisableLocalFirstLoadNTP))
+ return true;
FieldTrialFlags flags;
if (GetFieldTrialInfo(
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/search/instant_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698