diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 23:33:25 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 23:33:25 +0000 |
| commit | 9df334c1c572250320fdb994f7b7293131be9940 (patch) | |
| tree | 89d39b372bfe2cff06362dc9a242c3de42dfa967 /chrome/renderer | |
| parent | 420914939dd9d240be781df2492bdcd87e553973 (diff) | |
| download | chromium_src-9df334c1c572250320fdb994f7b7293131be9940.zip chromium_src-9df334c1c572250320fdb994f7b7293131be9940.tar.gz chromium_src-9df334c1c572250320fdb994f7b7293131be9940.tar.bz2 | |
revert r71405 as it is causing ui test failures:
Make new chrome UI security model the default.
allows us to update URL in chrome://settings when the user navigates within it.
BUG=57485
TEST=manual
Review URL: http://codereview.chromium.org/6277018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_thread.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index fd55fe8..a80fc7bd 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -864,7 +864,12 @@ void RenderThread::EnsureWebKitInitialized() { // also be unable to script anything but themselves (to help limit the damage // that a corrupt chrome: page could cause). WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme)); - WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme); + if (command_line.HasSwitch(switches::kNewChromeUISecurityModel)) { + WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme); + } else { + WebSecurityPolicy::registerURLSchemeAsLocal(chrome_ui_scheme); + WebSecurityPolicy::registerURLSchemeAsNoAccess(chrome_ui_scheme); + } // chrome-extension: resources shouldn't trigger insecure content warnings. WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme)); |