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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 254473011: Introduce chrome.shell.createWindow stub API for app_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase (shell-api) Created 6 years, 8 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
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 7101411854cac8efa6edc0dc8410dacfa847754b..66694c52d07c54e1f3685651940c1c02d63a62c1 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -226,6 +226,11 @@ bool ShouldUseJavaScriptSettingForPlugin(const WebPluginInfo& plugin) {
ChromeContentRendererClient::ChromeContentRendererClient() {
g_current_client = this;
+
+ extensions::ExtensionsClient::Set(
+ extensions::ChromeExtensionsClient::GetInstance());
+ extensions::ExtensionsRendererClient::Set(
+ ChromeExtensionsRendererClient::GetInstance());
}
ChromeContentRendererClient::~ChromeContentRendererClient() {
@@ -236,8 +241,9 @@ void ChromeContentRendererClient::RenderThreadStarted() {
RenderThread* thread = RenderThread::Get();
chrome_observer_.reset(new ChromeRenderProcessObserver(this));
+
// ChromeRenderViewTest::SetUp() creates its own ExtensionDispatcher and
- // injects it using SetExtensionDispatcher(). Don't overwrite it.
+ // injects it using SetExtensionDispatcherForTest(). Don't overwrite it.
if (!extension_dispatcher_)
extension_dispatcher_.reset(new extensions::Dispatcher());
permissions_policy_delegate_.reset(
@@ -359,11 +365,6 @@ void ChromeContentRendererClient::RenderThreadStarted() {
WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
extension_resource_scheme);
- extensions::ExtensionsClient::Set(
- extensions::ChromeExtensionsClient::GetInstance());
- extensions::ExtensionsRendererClient::Set(
- ChromeExtensionsRendererClient::GetInstance());
-
#if defined(OS_WIN)
// Report if the renderer process has been patched by chrome_elf.
// TODO(csharp): Remove once the renderer is no longer getting
@@ -1249,7 +1250,7 @@ bool ChromeContentRendererClient::ShouldOverridePageVisibilityState(
return true;
}
-void ChromeContentRendererClient::SetExtensionDispatcher(
+void ChromeContentRendererClient::SetExtensionDispatcherForTest(
extensions::Dispatcher* extension_dispatcher) {
extension_dispatcher_.reset(extension_dispatcher);
permissions_policy_delegate_.reset(
@@ -1257,6 +1258,11 @@ void ChromeContentRendererClient::SetExtensionDispatcher(
extension_dispatcher_.get()));
}
+extensions::Dispatcher*
+ChromeContentRendererClient::GetExtensionDispatcherForTest() {
+ return extension_dispatcher_.get();
+}
+
bool ChromeContentRendererClient::CrossesExtensionExtents(
WebFrame* frame,
const GURL& new_url,

Powered by Google App Engine
This is Rietveld 408576698