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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 970043002: Remove chrome.principals API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bad merge Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/principals_extension_bindings.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 30 matching lines...) Expand all
41 #include "chrome/renderer/playback_extension.h" 41 #include "chrome/renderer/playback_extension.h"
42 #include "chrome/renderer/plugins/chrome_plugin_placeholder.h" 42 #include "chrome/renderer/plugins/chrome_plugin_placeholder.h"
43 #include "chrome/renderer/plugins/plugin_preroller.h" 43 #include "chrome/renderer/plugins/plugin_preroller.h"
44 #include "chrome/renderer/plugins/plugin_uma.h" 44 #include "chrome/renderer/plugins/plugin_uma.h"
45 #include "chrome/renderer/plugins/shadow_dom_plugin_placeholder.h" 45 #include "chrome/renderer/plugins/shadow_dom_plugin_placeholder.h"
46 #include "chrome/renderer/prefetch_helper.h" 46 #include "chrome/renderer/prefetch_helper.h"
47 #include "chrome/renderer/prerender/prerender_dispatcher.h" 47 #include "chrome/renderer/prerender/prerender_dispatcher.h"
48 #include "chrome/renderer/prerender/prerender_helper.h" 48 #include "chrome/renderer/prerender/prerender_helper.h"
49 #include "chrome/renderer/prerender/prerender_media_load_deferrer.h" 49 #include "chrome/renderer/prerender/prerender_media_load_deferrer.h"
50 #include "chrome/renderer/prerender/prerenderer_client.h" 50 #include "chrome/renderer/prerender/prerenderer_client.h"
51 #include "chrome/renderer/principals_extension_bindings.h"
52 #include "chrome/renderer/safe_browsing/malware_dom_details.h" 51 #include "chrome/renderer/safe_browsing/malware_dom_details.h"
53 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 52 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
54 #include "chrome/renderer/searchbox/search_bouncer.h" 53 #include "chrome/renderer/searchbox/search_bouncer.h"
55 #include "chrome/renderer/searchbox/searchbox.h" 54 #include "chrome/renderer/searchbox/searchbox.h"
56 #include "chrome/renderer/searchbox/searchbox_extension.h" 55 #include "chrome/renderer/searchbox/searchbox_extension.h"
57 #include "chrome/renderer/tts_dispatcher.h" 56 #include "chrome/renderer/tts_dispatcher.h"
58 #include "chrome/renderer/worker_content_settings_client_proxy.h" 57 #include "chrome/renderer/worker_content_settings_client_proxy.h"
59 #include "components/autofill/content/renderer/autofill_agent.h" 58 #include "components/autofill/content/renderer/autofill_agent.h"
60 #include "components/autofill/content/renderer/password_autofill_agent.h" 59 #include "components/autofill/content/renderer/password_autofill_agent.h"
61 #include "components/autofill/content/renderer/password_generation_agent.h" 60 #include "components/autofill/content/renderer/password_generation_agent.h"
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 if (command_line->HasSwitch(switches::kEnableNetBenchmarking)) 429 if (command_line->HasSwitch(switches::kEnableNetBenchmarking))
431 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); 430 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get());
432 if (command_line->HasSwitch(switches::kInstantProcess)) 431 if (command_line->HasSwitch(switches::kInstantProcess))
433 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); 432 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
434 433
435 if (command_line->HasSwitch(switches::kPlaybackMode) || 434 if (command_line->HasSwitch(switches::kPlaybackMode) ||
436 command_line->HasSwitch(switches::kRecordMode)) { 435 command_line->HasSwitch(switches::kRecordMode)) {
437 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get()); 436 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get());
438 } 437 }
439 438
440 // TODO(guohui): needs to forward the new-profile-management switch to
441 // renderer processes.
442 if (switches::IsEnableAccountConsistency())
443 thread->RegisterExtension(extensions_v8::PrincipalsExtension::Get());
444
445 // chrome:, chrome-search:, chrome-devtools:, and chrome-distiller: pages 439 // chrome:, chrome-search:, chrome-devtools:, and chrome-distiller: pages
446 // should not be accessible by normal content, and should also be unable to 440 // should not be accessible by normal content, and should also be unable to
447 // script anything but themselves (to help limit the damage that a corrupt 441 // script anything but themselves (to help limit the damage that a corrupt
448 // page could cause). 442 // page could cause).
449 WebString chrome_ui_scheme(ASCIIToUTF16(content::kChromeUIScheme)); 443 WebString chrome_ui_scheme(ASCIIToUTF16(content::kChromeUIScheme));
450 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme); 444 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme);
451 445
452 WebString chrome_search_scheme(ASCIIToUTF16(chrome::kChromeSearchScheme)); 446 WebString chrome_search_scheme(ASCIIToUTF16(chrome::kChromeSearchScheme));
453 // The Instant process can only display the content but not read it. Other 447 // The Instant process can only display the content but not read it. Other
454 // processes can't display it or read it. 448 // processes can't display it or read it.
(...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1658 if (mime_type == content::kBrowserPluginMimeType) { 1652 if (mime_type == content::kBrowserPluginMimeType) {
1659 return new extensions::ExtensionsGuestViewContainer(render_frame); 1653 return new extensions::ExtensionsGuestViewContainer(render_frame);
1660 } else { 1654 } else {
1661 return new extensions::MimeHandlerViewContainer( 1655 return new extensions::MimeHandlerViewContainer(
1662 render_frame, mime_type, original_url); 1656 render_frame, mime_type, original_url);
1663 } 1657 }
1664 #else 1658 #else
1665 return NULL; 1659 return NULL;
1666 #endif 1660 #endif
1667 } 1661 }
OLDNEW
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/principals_extension_bindings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698