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

Side by Side Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 330143002: Simplify geolocation permission request in the Content API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 | Annotate | Revision Log
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 "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/browser/browser_view_renderer.h" 8 #include "android_webview/browser/browser_view_renderer.h"
9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" 9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
10 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 10 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
11 #include "android_webview/common/aw_switches.h" 11 #include "android_webview/common/aw_switches.h"
12 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" 12 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
13 #include "android_webview/native/aw_geolocation_permission_context.h"
14 #include "android_webview/native/aw_quota_manager_bridge_impl.h" 13 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
15 #include "android_webview/native/aw_web_contents_view_delegate.h" 14 #include "android_webview/native/aw_web_contents_view_delegate.h"
16 #include "android_webview/native/aw_web_preferences_populater_impl.h" 15 #include "android_webview/native/aw_web_preferences_populater_impl.h"
17 #include "android_webview/native/external_video_surface_container_impl.h" 16 #include "android_webview/native/external_video_surface_container_impl.h"
18 #include "android_webview/renderer/aw_content_renderer_client.h" 17 #include "android_webview/renderer/aw_content_renderer_client.h"
19 #include "base/command_line.h" 18 #include "base/command_line.h"
20 #include "base/cpu.h" 19 #include "base/cpu.h"
21 #include "base/lazy_instance.h" 20 #include "base/lazy_instance.h"
22 #include "base/logging.h" 21 #include "base/logging.h"
23 #include "base/memory/scoped_ptr.h" 22 #include "base/memory/scoped_ptr.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 AwMainDelegate::CreateContentRendererClient() { 140 AwMainDelegate::CreateContentRendererClient() {
142 content_renderer_client_.reset(new AwContentRendererClient()); 141 content_renderer_client_.reset(new AwContentRendererClient());
143 return content_renderer_client_.get(); 142 return content_renderer_client_.get();
144 } 143 }
145 144
146 scoped_refptr<AwQuotaManagerBridge> AwMainDelegate::CreateAwQuotaManagerBridge( 145 scoped_refptr<AwQuotaManagerBridge> AwMainDelegate::CreateAwQuotaManagerBridge(
147 AwBrowserContext* browser_context) { 146 AwBrowserContext* browser_context) {
148 return AwQuotaManagerBridgeImpl::Create(browser_context); 147 return AwQuotaManagerBridgeImpl::Create(browser_context);
149 } 148 }
150 149
151 content::GeolocationPermissionContext*
152 AwMainDelegate::CreateGeolocationPermission(
153 AwBrowserContext* browser_context) {
154 return AwGeolocationPermissionContext::Create(browser_context);
155 }
156
157 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( 150 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
158 content::WebContents* web_contents) { 151 content::WebContents* web_contents) {
159 return AwWebContentsViewDelegate::Create(web_contents); 152 return AwWebContentsViewDelegate::Create(web_contents);
160 } 153 }
161 154
162 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() { 155 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() {
163 return new AwWebPreferencesPopulaterImpl(); 156 return new AwWebPreferencesPopulaterImpl();
164 } 157 }
165 158
166 #if defined(VIDEO_HOLE) 159 #if defined(VIDEO_HOLE)
167 content::ExternalVideoSurfaceContainer* 160 content::ExternalVideoSurfaceContainer*
168 AwMainDelegate::CreateExternalVideoSurfaceContainer( 161 AwMainDelegate::CreateExternalVideoSurfaceContainer(
169 content::WebContents* web_contents) { 162 content::WebContents* web_contents) {
170 return new ExternalVideoSurfaceContainerImpl(web_contents); 163 return new ExternalVideoSurfaceContainerImpl(web_contents);
171 } 164 }
172 #endif 165 #endif
173 166
174 } // namespace android_webview 167 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/lib/main/aw_main_delegate.h ('k') | android_webview/native/aw_contents_client_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698