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 "content/public/browser/browser_main_runner.h" | 15 #include "content/public/browser/browser_main_runner.h" |
15 #include "content/public/common/content_switches.h" | 16 #include "content/public/common/content_switches.h" |
16 | 17 |
17 namespace android_webview { | 18 namespace android_webview { |
18 | 19 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 | 62 |
62 void AwMainDelegate::ProcessExiting(const std::string& process_type) { | 63 void AwMainDelegate::ProcessExiting(const std::string& process_type) { |
63 // TODO(torne): Clean up resources when we handle them. | 64 // TODO(torne): Clean up resources when we handle them. |
64 | 65 |
65 logging::CloseLogFile(); | 66 logging::CloseLogFile(); |
66 } | 67 } |
67 | 68 |
68 content::ContentBrowserClient* | 69 content::ContentBrowserClient* |
69 AwMainDelegate::CreateContentBrowserClient() { | 70 AwMainDelegate::CreateContentBrowserClient() { |
70 content_browser_client_.reset( | 71 content_browser_client_.reset( |
71 new AwContentBrowserClient(&AwWebContentsViewDelegate::Create)); | 72 new AwContentBrowserClient( |
| 73 &AwWebContentsViewDelegate::Create, |
| 74 &AwGeolocationPermissionContext::Create)); |
72 | 75 |
73 return content_browser_client_.get(); | 76 return content_browser_client_.get(); |
74 } | 77 } |
75 | 78 |
76 content::ContentRendererClient* | 79 content::ContentRendererClient* |
77 AwMainDelegate::CreateContentRendererClient() { | 80 AwMainDelegate::CreateContentRendererClient() { |
78 content_renderer_client_.reset(new AwContentRendererClient()); | 81 content_renderer_client_.reset(new AwContentRendererClient()); |
79 return content_renderer_client_.get(); | 82 return content_renderer_client_.get(); |
80 } | 83 } |
81 | 84 |
82 } // namespace android_webview | 85 } // namespace android_webview |
OLD | NEW |