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

Side by Side 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: works (shell-api) Created 6 years, 7 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 | Annotate | Revision Log
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/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 } 229 }
230 230
231 ChromeContentRendererClient::~ChromeContentRendererClient() { 231 ChromeContentRendererClient::~ChromeContentRendererClient() {
232 g_current_client = NULL; 232 g_current_client = NULL;
233 } 233 }
234 234
235 void ChromeContentRendererClient::RenderThreadStarted() { 235 void ChromeContentRendererClient::RenderThreadStarted() {
236 RenderThread* thread = RenderThread::Get(); 236 RenderThread* thread = RenderThread::Get();
237 237
238 chrome_observer_.reset(new ChromeRenderProcessObserver(this)); 238 chrome_observer_.reset(new ChromeRenderProcessObserver(this));
239
240 // Extensions clients must be created before extensions::Dispatcher.
241 extensions::ExtensionsClient::Set(
242 extensions::ChromeExtensionsClient::GetInstance());
243 extensions::ExtensionsRendererClient::Set(
244 ChromeExtensionsRendererClient::GetInstance());
245
239 // ChromeRenderViewTest::SetUp() creates its own ExtensionDispatcher and 246 // ChromeRenderViewTest::SetUp() creates its own ExtensionDispatcher and
240 // injects it using SetExtensionDispatcher(). Don't overwrite it. 247 // injects it using SetExtensionDispatcher(). Don't overwrite it.
241 if (!extension_dispatcher_) 248 if (!extension_dispatcher_)
242 extension_dispatcher_.reset(new extensions::Dispatcher()); 249 extension_dispatcher_.reset(new extensions::Dispatcher());
243 permissions_policy_delegate_.reset( 250 permissions_policy_delegate_.reset(
244 new extensions::RendererPermissionsPolicyDelegate( 251 new extensions::RendererPermissionsPolicyDelegate(
245 extension_dispatcher_.get())); 252 extension_dispatcher_.get()));
246 prescient_networking_dispatcher_.reset(new PrescientNetworkingDispatcher()); 253 prescient_networking_dispatcher_.reset(new PrescientNetworkingDispatcher());
247 net_predictor_.reset(new RendererNetPredictor()); 254 net_predictor_.reset(new RendererNetPredictor());
248 #if defined(ENABLE_SPELLCHECK) 255 #if defined(ENABLE_SPELLCHECK)
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 // requests. 359 // requests.
353 WebSecurityPolicy::registerURLSchemeAsCORSEnabled(extension_resource_scheme); 360 WebSecurityPolicy::registerURLSchemeAsCORSEnabled(extension_resource_scheme);
354 361
355 // chrome-extension: resources should bypass Content Security Policy checks 362 // chrome-extension: resources should bypass Content Security Policy checks
356 // when included in protected resources. 363 // when included in protected resources.
357 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( 364 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
358 extension_scheme); 365 extension_scheme);
359 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( 366 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
360 extension_resource_scheme); 367 extension_resource_scheme);
361 368
362 extensions::ExtensionsClient::Set(
363 extensions::ChromeExtensionsClient::GetInstance());
364 extensions::ExtensionsRendererClient::Set(
365 ChromeExtensionsRendererClient::GetInstance());
366
367 #if defined(OS_WIN) 369 #if defined(OS_WIN)
368 // Report if the renderer process has been patched by chrome_elf. 370 // Report if the renderer process has been patched by chrome_elf.
369 // TODO(csharp): Remove once the renderer is no longer getting 371 // TODO(csharp): Remove once the renderer is no longer getting
370 // patched this way. 372 // patched this way.
371 if (blacklist::IsBlacklistInitialized()) 373 if (blacklist::IsBlacklistInitialized())
372 UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true); 374 UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true);
373 #endif 375 #endif
374 } 376 }
375 377
376 void ChromeContentRendererClient::RenderFrameCreated( 378 void ChromeContentRendererClient::RenderFrameCreated(
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after
1438 CommandLine* command_line = CommandLine::ForCurrentProcess(); 1440 CommandLine* command_line = CommandLine::ForCurrentProcess();
1439 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); 1441 return !command_line->HasSwitch(extensions::switches::kExtensionProcess);
1440 } 1442 }
1441 1443
1442 blink::WebWorkerPermissionClientProxy* 1444 blink::WebWorkerPermissionClientProxy*
1443 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( 1445 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
1444 content::RenderFrame* render_frame, 1446 content::RenderFrame* render_frame,
1445 blink::WebFrame* frame) { 1447 blink::WebFrame* frame) {
1446 return new WorkerPermissionClientProxy(render_frame, frame); 1448 return new WorkerPermissionClientProxy(render_frame, frame);
1447 } 1449 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698