| OLD | NEW |
| 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 "android_webview/lib/main/aw_main_delegate.h" | 5 #include "android_webview/lib/main/aw_main_delegate.h" |
| 6 | 6 |
| 7 #include "android_webview/common/url_constants.h" | 7 #include "android_webview/common/url_constants.h" |
| 8 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" | 8 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" |
| 9 #include "android_webview/lib/aw_content_browser_client.h" | 9 #include "android_webview/lib/aw_content_browser_client.h" |
| 10 #include "android_webview/renderer/aw_render_process_observer.h" |
| 10 #include "android_webview/renderer/aw_render_view_ext.h" | 11 #include "android_webview/renderer/aw_render_view_ext.h" |
| 11 #include "base/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
| 12 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "content/public/renderer/render_thread.h" |
| 14 #include "chrome/common/chrome_paths.h" | 17 #include "chrome/common/chrome_paths.h" |
| 15 #include "chrome/renderer/chrome_content_renderer_client.h" | 18 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 16 #include "content/public/browser/browser_main_runner.h" | 19 #include "content/public/browser/browser_main_runner.h" |
| 17 #include "content/public/common/content_client.h" | 20 #include "content/public/common/content_client.h" |
| 18 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" | 21 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
| 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" | 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" |
| 20 | 23 |
| 21 namespace android_webview { | 24 namespace android_webview { |
| 22 | 25 |
| 23 namespace { | 26 namespace { |
| 24 | 27 |
| 25 // TODO(joth): Remove chrome/ dependency; move into android_webview/renderer | 28 // TODO(joth): Remove chrome/ dependency; move into android_webview/renderer |
| 26 class AwContentRendererClient : public chrome::ChromeContentRendererClient { | 29 class AwContentRendererClient : public chrome::ChromeContentRendererClient { |
| 27 public: | 30 public: |
| 28 virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE { | 31 virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE { |
| 29 chrome::ChromeContentRendererClient::RenderViewCreated(render_view); | 32 chrome::ChromeContentRendererClient::RenderViewCreated(render_view); |
| 30 AwRenderViewExt::RenderViewCreated(render_view); | 33 AwRenderViewExt::RenderViewCreated(render_view); |
| 31 } | 34 } |
| 32 | 35 |
| 33 virtual void RenderThreadStarted() OVERRIDE { | 36 virtual void RenderThreadStarted() OVERRIDE { |
| 34 chrome::ChromeContentRendererClient::RenderThreadStarted(); | 37 chrome::ChromeContentRendererClient::RenderThreadStarted(); |
| 35 WebKit::WebString content_scheme( | 38 WebKit::WebString content_scheme( |
| 36 ASCIIToUTF16(android_webview::kContentScheme)); | 39 ASCIIToUTF16(android_webview::kContentScheme)); |
| 37 WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme); | 40 WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme); |
| 41 |
| 42 aw_render_process_observer_.reset(new AwRenderProcessObserver); |
| 43 content::RenderThread::Get()->AddObserver( |
| 44 aw_render_process_observer_.get()); |
| 38 } | 45 } |
| 46 |
| 47 private: |
| 48 scoped_ptr<AwRenderProcessObserver> aw_render_process_observer_; |
| 39 }; | 49 }; |
| 40 | 50 |
| 41 } | 51 } |
| 42 | 52 |
| 43 base::LazyInstance<AwContentBrowserClient> | 53 base::LazyInstance<AwContentBrowserClient> |
| 44 g_webview_content_browser_client = LAZY_INSTANCE_INITIALIZER; | 54 g_webview_content_browser_client = LAZY_INSTANCE_INITIALIZER; |
| 45 base::LazyInstance<AwContentRendererClient> | 55 base::LazyInstance<AwContentRendererClient> |
| 46 g_webview_content_renderer_client = LAZY_INSTANCE_INITIALIZER; | 56 g_webview_content_renderer_client = LAZY_INSTANCE_INITIALIZER; |
| 47 | 57 |
| 48 AwMainDelegate::AwMainDelegate() { | 58 AwMainDelegate::AwMainDelegate() { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 AwMainDelegate::CreateContentBrowserClient() { | 106 AwMainDelegate::CreateContentBrowserClient() { |
| 97 return &g_webview_content_browser_client.Get(); | 107 return &g_webview_content_browser_client.Get(); |
| 98 } | 108 } |
| 99 | 109 |
| 100 content::ContentRendererClient* | 110 content::ContentRendererClient* |
| 101 AwMainDelegate::CreateContentRendererClient() { | 111 AwMainDelegate::CreateContentRendererClient() { |
| 102 return &g_webview_content_renderer_client.Get(); | 112 return &g_webview_content_renderer_client.Get(); |
| 103 } | 113 } |
| 104 | 114 |
| 105 } // namespace android_webview | 115 } // namespace android_webview |
| OLD | NEW |