OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/debug/crash_logging.h" | 8 #include "base/debug/crash_logging.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 | 382 |
383 WebString dev_tools_scheme(ASCIIToUTF16(content::kChromeDevToolsScheme)); | 383 WebString dev_tools_scheme(ASCIIToUTF16(content::kChromeDevToolsScheme)); |
384 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dev_tools_scheme); | 384 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dev_tools_scheme); |
385 | 385 |
386 WebString dom_distiller_scheme( | 386 WebString dom_distiller_scheme( |
387 ASCIIToUTF16(dom_distiller::kDomDistillerScheme)); | 387 ASCIIToUTF16(dom_distiller::kDomDistillerScheme)); |
388 // TODO(nyquist): Add test to ensure this happens when the flag is set. | 388 // TODO(nyquist): Add test to ensure this happens when the flag is set. |
389 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dom_distiller_scheme); | 389 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dom_distiller_scheme); |
390 | 390 |
391 #if defined(OS_CHROMEOS) | 391 #if defined(OS_CHROMEOS) |
392 WebString drive_scheme(ASCIIToUTF16(chrome::kDriveScheme)); | 392 WebString external_file_scheme(ASCIIToUTF16(chrome::kExternalFileScheme)); |
393 WebSecurityPolicy::registerURLSchemeAsLocal(drive_scheme); | 393 WebSecurityPolicy::registerURLSchemeAsLocal(external_file_scheme); |
394 #endif | 394 #endif |
395 | 395 |
396 // chrome: and chrome-search: pages should not be accessible by bookmarklets | 396 // chrome: and chrome-search: pages should not be accessible by bookmarklets |
397 // or javascript: URLs typed in the omnibox. | 397 // or javascript: URLs typed in the omnibox. |
398 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( | 398 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( |
399 chrome_ui_scheme); | 399 chrome_ui_scheme); |
400 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( | 400 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( |
401 chrome_search_scheme); | 401 chrome_search_scheme); |
402 | 402 |
403 // chrome:, chrome-search:, and chrome-extension: resources shouldn't trigger | 403 // chrome:, chrome-search:, and chrome-extension: resources shouldn't trigger |
(...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1570 content::BrowserPluginDelegate* | 1570 content::BrowserPluginDelegate* |
1571 ChromeContentRendererClient::CreateBrowserPluginDelegate( | 1571 ChromeContentRendererClient::CreateBrowserPluginDelegate( |
1572 content::RenderFrame* render_frame, | 1572 content::RenderFrame* render_frame, |
1573 const std::string& mime_type) { | 1573 const std::string& mime_type) { |
1574 #if defined(ENABLE_EXTENSIONS) | 1574 #if defined(ENABLE_EXTENSIONS) |
1575 return new extensions::GuestViewContainer(render_frame, mime_type); | 1575 return new extensions::GuestViewContainer(render_frame, mime_type); |
1576 #else | 1576 #else |
1577 return NULL; | 1577 return NULL; |
1578 #endif | 1578 #endif |
1579 } | 1579 } |
OLD | NEW |