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

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 579004: Pull latest googleurl to get various fixes (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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 | « DEPS ('k') | chrome/browser/child_process_security_policy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_dll_main.cc
===================================================================
--- chrome/app/chrome_dll_main.cc (revision 40415)
+++ chrome/app/chrome_dll_main.cc (working copy)
@@ -55,6 +55,7 @@
#include "chrome/common/logging_chrome.h"
#include "chrome/common/main_function_params.h"
#include "chrome/common/sandbox_init_wrapper.h"
+#include "chrome/common/url_constants.h"
#include "ipc/ipc_switches.h"
#if defined(USE_NSS)
@@ -644,6 +645,11 @@
}
logging::InitChromeLogging(parsed_command_line, file_state);
+ // Register internal Chrome schemes so they'll be parsed correctly. This must
+ // happen before we process any URLs with the affected schemes, and must be
+ // done in all processes that work with these URLs (i.e. including renderers).
+ chrome::RegisterChromeSchemes();
+
#ifdef NDEBUG
if (parsed_command_line.HasSwitch(switches::kSilentDumpOnDCHECK) &&
parsed_command_line.HasSwitch(switches::kEnableDCHECK)) {
« no previous file with comments | « DEPS ('k') | chrome/browser/child_process_security_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698