summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authordcblack@chromium.org <dcblack@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 05:26:00 +0000
committerdcblack@chromium.org <dcblack@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 05:26:00 +0000
commited30b97f677634b3d01e02d4e22e918c820322d5 (patch)
treeb55e31ee2378abaa806a7655fcb28d96a72e1797 /chrome/common
parent58c740fa707d664527a92b6e4df7eb955d33fa38 (diff)
downloadchromium_src-ed30b97f677634b3d01e02d4e22e918c820322d5.zip
chromium_src-ed30b97f677634b3d01e02d4e22e918c820322d5.tar.gz
chromium_src-ed30b97f677634b3d01e02d4e22e918c820322d5.tar.bz2
If the online search provider page fails to load (404 or other error code) then we fall back to the local fallback page. Also falls back if the user switches away from a tab before it's done loading, to prevent Ctrl-TTTTTTTTTT from completely bogging down the network.
BUG= Review URL: https://chromiumcodereview.appspot.com/14043009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc6
-rw-r--r--chrome/common/chrome_switches.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 6197a21..d232616 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -335,6 +335,9 @@ const char kDisableIPv6[] = "disable-ipv6";
// attempt to use the existing connection.
const char kDisableIPPooling[] = "disable-ip-pooling";
+// Disable always using the local NTP for the first NTP load of a new window.
+const char kDisableLocalFirstLoadNTP[] = "disable-local-first-load-ntp";
+
// Disable local-only Instant extended API.
const char kDisableLocalOnlyInstantExtendedAPI[] =
"disable-local-only-instant-extended-api";
@@ -558,6 +561,9 @@ const char kEnableIPCFuzzing[] = "enable-ipc-fuzzing";
// attempt to use the existing connection.
const char kEnableIPPooling[] = "enable-ip-pooling";
+// Enable always using the local NTP for the first NTP load of a new window.
+const char kEnableLocalFirstLoadNTP[] = "enable-local-first-load-ntp";
+
// Enable Instant extended API, but use only the local omnibox popup and NTP.
const char kEnableLocalOnlyInstantExtendedAPI[] =
"enable-local-only-instant-extended-api";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 3f1d2c4d..471b567 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -101,6 +101,7 @@ extern const char kDisableImprovedDownloadProtection[];
extern const char kDisableInstantExtendedAPI[];
extern const char kDisableIPv6[];
extern const char kDisableIPPooling[];
+extern const char kDisableLocalFirstLoadNTP[];
extern const char kDisableLocalOnlyInstantExtendedAPI[];
extern const char kDisableMinimizeOnSecondLauncherItemClick[];
extern const char kDisableNativeAutofillUi[];
@@ -159,6 +160,7 @@ extern const char kEnableInteractiveAutocomplete[];
extern const char kEnableIPCFuzzing[];
extern const char kEnableIPPooling[];
extern const char kEnableIPv6[];
+extern const char kEnableLocalFirstLoadNTP[];
extern const char kEnableLocalOnlyInstantExtendedAPI[];
extern const char kEnableManagedStorage[];
extern const char kEnableManagedUsers[];