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

Side by Side Diff: content/shell/renderer/shell_content_renderer_client.cc

Issue 1821413003: Remove logic for lazy initialization of WebKit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 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
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 "content/shell/renderer/shell_content_renderer_client.h" 5 #include "content/shell/renderer/shell_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "components/web_cache/renderer/web_cache_render_process_observer.h" 8 #include "components/web_cache/renderer/web_cache_render_process_observer.h"
9 #include "content/public/renderer/render_thread.h"
10 #include "content/shell/renderer/shell_render_view_observer.h" 9 #include "content/shell/renderer/shell_render_view_observer.h"
11 #include "third_party/WebKit/public/web/WebView.h" 10 #include "third_party/WebKit/public/web/WebView.h"
12 #include "v8/include/v8.h" 11 #include "v8/include/v8.h"
13 12
14 #if defined(ENABLE_PLUGINS) 13 #if defined(ENABLE_PLUGINS)
15 #include "ppapi/shared_impl/ppapi_switches.h" 14 #include "ppapi/shared_impl/ppapi_switches.h"
16 #endif 15 #endif
17 16
18 namespace content { 17 namespace content {
19 18
20 ShellContentRendererClient::ShellContentRendererClient() {} 19 ShellContentRendererClient::ShellContentRendererClient() {}
21 20
22 ShellContentRendererClient::~ShellContentRendererClient() { 21 ShellContentRendererClient::~ShellContentRendererClient() {
23 } 22 }
24 23
25 void ShellContentRendererClient::RenderThreadStarted() { 24 void ShellContentRendererClient::RenderThreadStarted() {
26 RenderThread* thread = RenderThread::Get();
27 web_cache_observer_.reset(new web_cache::WebCacheRenderProcessObserver()); 25 web_cache_observer_.reset(new web_cache::WebCacheRenderProcessObserver());
28 thread->AddObserver(web_cache_observer_.get());
29 } 26 }
30 27
31 void ShellContentRendererClient::RenderViewCreated(RenderView* render_view) { 28 void ShellContentRendererClient::RenderViewCreated(RenderView* render_view) {
32 new ShellRenderViewObserver(render_view); 29 new ShellRenderViewObserver(render_view);
33 } 30 }
34 31
35 bool ShellContentRendererClient::IsPluginAllowedToUseCompositorAPI( 32 bool ShellContentRendererClient::IsPluginAllowedToUseCompositorAPI(
36 const GURL& url) { 33 const GURL& url) {
37 #if defined(ENABLE_PLUGINS) 34 #if defined(ENABLE_PLUGINS)
38 return base::CommandLine::ForCurrentProcess()->HasSwitch( 35 return base::CommandLine::ForCurrentProcess()->HasSwitch(
39 switches::kEnablePepperTesting); 36 switches::kEnablePepperTesting);
40 #else 37 #else
41 return false; 38 return false;
42 #endif 39 #endif
43 } 40 }
44 41
45 bool ShellContentRendererClient::IsPluginAllowedToUseDevChannelAPIs() { 42 bool ShellContentRendererClient::IsPluginAllowedToUseDevChannelAPIs() {
46 #if defined(ENABLE_PLUGINS) 43 #if defined(ENABLE_PLUGINS)
47 return base::CommandLine::ForCurrentProcess()->HasSwitch( 44 return base::CommandLine::ForCurrentProcess()->HasSwitch(
48 switches::kEnablePepperTesting); 45 switches::kEnablePepperTesting);
49 #else 46 #else
50 return false; 47 return false;
51 #endif 48 #endif
52 } 49 }
53 50
54 } // namespace content 51 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698