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

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

Issue 78303005: ContentSettings API should not interact with <webview> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small cleanup/refactor Created 7 years, 1 month 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
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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 extension_resource_scheme); 339 extension_resource_scheme);
340 340
341 extensions::ExtensionsClient::Set( 341 extensions::ExtensionsClient::Set(
342 extensions::ChromeExtensionsClient::GetInstance()); 342 extensions::ChromeExtensionsClient::GetInstance());
343 } 343 }
344 344
345 void ChromeContentRendererClient::RenderViewCreated( 345 void ChromeContentRendererClient::RenderViewCreated(
346 content::RenderView* render_view) { 346 content::RenderView* render_view) {
347 ContentSettingsObserver* content_settings = 347 ContentSettingsObserver* content_settings =
348 new ContentSettingsObserver(render_view); 348 new ContentSettingsObserver(render_view);
349 if (chrome_observer_.get()) {
350 content_settings->SetContentSettingRules(
351 chrome_observer_->content_setting_rules());
352 }
353 new extensions::ExtensionHelper(render_view, extension_dispatcher_.get()); 349 new extensions::ExtensionHelper(render_view, extension_dispatcher_.get());
354 new PageLoadHistograms(render_view); 350 new PageLoadHistograms(render_view);
355 #if defined(ENABLE_PRINTING) 351 #if defined(ENABLE_PRINTING)
356 new printing::PrintWebViewHelper(render_view); 352 new printing::PrintWebViewHelper(render_view);
357 #endif 353 #endif
358 #if defined(ENABLE_SPELLCHECK) 354 #if defined(ENABLE_SPELLCHECK)
359 new SpellCheckProvider(render_view, spellcheck_.get()); 355 new SpellCheckProvider(render_view, spellcheck_.get());
360 #endif 356 #endif
361 new prerender::PrerendererClient(render_view); 357 new prerender::PrerendererClient(render_view);
362 #if defined(FULL_SAFE_BROWSING) 358 #if defined(FULL_SAFE_BROWSING)
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1364 CommandLine* command_line = CommandLine::ForCurrentProcess(); 1360 CommandLine* command_line = CommandLine::ForCurrentProcess();
1365 return !command_line->HasSwitch(switches::kExtensionProcess); 1361 return !command_line->HasSwitch(switches::kExtensionProcess);
1366 } 1362 }
1367 1363
1368 blink::WebWorkerPermissionClientProxy* 1364 blink::WebWorkerPermissionClientProxy*
1369 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( 1365 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
1370 content::RenderView* render_view, 1366 content::RenderView* render_view,
1371 blink::WebFrame* frame) { 1367 blink::WebFrame* frame) {
1372 return new WorkerPermissionClientProxy(render_view, frame); 1368 return new WorkerPermissionClientProxy(render_view, frame);
1373 } 1369 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698