diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 05:06:20 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 05:06:20 +0000 |
| commit | 7fc13edf63fcb30391edec083ea496809607917a (patch) | |
| tree | 16d7123511520ba9b7f1ca1d36093bdc71dc97d1 /chrome/app/chrome_dll_main.cc | |
| parent | 309d27740389acc1cfdda031b8fb43781e6022a3 (diff) | |
| download | chromium_src-7fc13edf63fcb30391edec083ea496809607917a.zip chromium_src-7fc13edf63fcb30391edec083ea496809607917a.tar.gz chromium_src-7fc13edf63fcb30391edec083ea496809607917a.tar.bz2 | |
Pulls the latest googleurl to get the fix for
BUG=http://crbug.com/160
and integrates the update to IsStandard in that version. Adds several internal
schemes as "standard" and initializes them at startup. Fixes a few hardcoded
URL schemes I noticed.
Make typing "//foo" into the URL bar treat slashes in "strict" mode on Windows,
which means we'll only accept UNC if you use backslashes. This matches IE's
behavior.
BUG=http://crbug.com/33038
TEST=covered by unit tests
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index b8188bf..60d5d6a 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -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 @@ int ChromeMain(int argc, char** argv) { } 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)) { |