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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 10985083: Upstreaming SpdyProxy-related switches, OTR logic, and histograms (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Removed non-change from pref_names.h Created 8 years, 3 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: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 8eae62dc5a57a9ed4ec51690999daf81d92442ba..da2be587851d56118124db642cb576f12c81630b 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -922,6 +922,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kProfilingFlush,
switches::kRecordMode,
switches::kSilentDumpOnDCHECK,
+ switches::kSpdyProxyOrigin,
switches::kWhitelistedExtensionID,
};
@@ -931,6 +932,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
static const char* const kSwitchNames[] = {
switches::kAllowHTTPBackgroundPage,
switches::kEnableExperimentalExtensionApis,
+ switches::kSpdyProxyOrigin,
Lei Zhang 2012/10/02 00:25:14 Do utility processes really need this switch?
bengr (incorrect) 2012/10/02 18:19:01 I don't believe so. Removed. On 2012/10/02 00:25:
switches::kWhitelistedExtensionID,
};

Powered by Google App Engine
This is Rietveld 408576698