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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 12316144: Merge 183832 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 years, 10 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/io_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
===================================================================
--- chrome/browser/chrome_content_browser_client.cc (revision 184791)
+++ chrome/browser/chrome_content_browser_client.cc (working copy)
@@ -1163,7 +1163,7 @@
switches::kProfilingFlush,
switches::kRecordMode,
switches::kSilentDumpOnDCHECK,
- switches::kSpdyProxyOrigin,
+ switches::kSpdyProxyAuthOrigin,
switches::kWhitelistedExtensionID,
};
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/io_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698