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

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

Issue 16046003: Move webkit/gpu into webkit/common/gpu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in content/common/gpu/client/gl_helper_* Created 7 years, 7 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
« no previous file with comments | « android_webview/browser/gpu_memory_buffer_impl.cc ('k') | cc/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/in_process_renderer/in_process_renderer_client .h" 8 #include "android_webview/browser/in_process_renderer/in_process_renderer_client .h"
9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
10 #include "android_webview/common/aw_switches.h" 10 #include "android_webview/common/aw_switches.h"
11 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" 11 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
12 #include "android_webview/native/aw_geolocation_permission_context.h" 12 #include "android_webview/native/aw_geolocation_permission_context.h"
13 #include "android_webview/native/aw_quota_manager_bridge_impl.h" 13 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
14 #include "android_webview/native/aw_web_contents_view_delegate.h" 14 #include "android_webview/native/aw_web_contents_view_delegate.h"
15 #include "android_webview/renderer/aw_content_renderer_client.h" 15 #include "android_webview/renderer/aw_content_renderer_client.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/lazy_instance.h" 17 #include "base/lazy_instance.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
20 #include "base/threading/thread_restrictions.h" 20 #include "base/threading/thread_restrictions.h"
21 #include "cc/base/switches.h" 21 #include "cc/base/switches.h"
22 #include "content/public/browser/browser_main_runner.h" 22 #include "content/public/browser/browser_main_runner.h"
23 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" 25 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h"
26 26
27 namespace android_webview { 27 namespace android_webview {
28 28
29 namespace { 29 namespace {
30 30
31 // TODO(boliu): Remove these global Allows once the underlying issues are 31 // TODO(boliu): Remove these global Allows once the underlying issues are
32 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below. 32 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below.
33 33
34 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> > 34 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> >
35 g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER; 35 g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 AwBrowserContext* browser_context) { 144 AwBrowserContext* browser_context) {
145 return AwGeolocationPermissionContext::Create(browser_context); 145 return AwGeolocationPermissionContext::Create(browser_context);
146 } 146 }
147 147
148 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( 148 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
149 content::WebContents* web_contents) { 149 content::WebContents* web_contents) {
150 return AwWebContentsViewDelegate::Create(web_contents); 150 return AwWebContentsViewDelegate::Create(web_contents);
151 } 151 }
152 152
153 } // namespace android_webview 153 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/gpu_memory_buffer_impl.cc ('k') | cc/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698