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/browser/aw_content_browser_client.h" | 7 #include "android_webview/browser/aw_content_browser_client.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/native/aw_geolocation_permission_context.h" |
9 #include "android_webview/native/aw_web_contents_view_delegate.h" | 10 #include "android_webview/native/aw_web_contents_view_delegate.h" |
10 #include "android_webview/renderer/aw_content_renderer_client.h" | 11 #include "android_webview/renderer/aw_content_renderer_client.h" |
11 #include "base/command_line.h" | 12 #include "base/command_line.h" |
12 #include "base/logging.h" | 13 #include "base/logging.h" |
13 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
14 #include "cc/switches.h" | 15 #include "cc/switches.h" |
15 #include "content/public/browser/browser_main_runner.h" | 16 #include "content/public/browser/browser_main_runner.h" |
16 #include "content/public/common/content_switches.h" | 17 #include "content/public/common/content_switches.h" |
17 | 18 |
18 namespace android_webview { | 19 namespace android_webview { |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 | 72 |
72 void AwMainDelegate::ProcessExiting(const std::string& process_type) { | 73 void AwMainDelegate::ProcessExiting(const std::string& process_type) { |
73 // TODO(torne): Clean up resources when we handle them. | 74 // TODO(torne): Clean up resources when we handle them. |
74 | 75 |
75 logging::CloseLogFile(); | 76 logging::CloseLogFile(); |
76 } | 77 } |
77 | 78 |
78 content::ContentBrowserClient* | 79 content::ContentBrowserClient* |
79 AwMainDelegate::CreateContentBrowserClient() { | 80 AwMainDelegate::CreateContentBrowserClient() { |
80 content_browser_client_.reset( | 81 content_browser_client_.reset( |
81 new AwContentBrowserClient(&AwWebContentsViewDelegate::Create)); | 82 new AwContentBrowserClient( |
| 83 &AwWebContentsViewDelegate::Create, |
| 84 &AwGeolocationPermissionContext::Create)); |
82 | 85 |
83 return content_browser_client_.get(); | 86 return content_browser_client_.get(); |
84 } | 87 } |
85 | 88 |
86 content::ContentRendererClient* | 89 content::ContentRendererClient* |
87 AwMainDelegate::CreateContentRendererClient() { | 90 AwMainDelegate::CreateContentRendererClient() { |
88 content_renderer_client_.reset(new AwContentRendererClient()); | 91 content_renderer_client_.reset(new AwContentRendererClient()); |
89 return content_renderer_client_.get(); | 92 return content_renderer_client_.get(); |
90 } | 93 } |
91 | 94 |
92 } // namespace android_webview | 95 } // namespace android_webview |
OLD | NEW |