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/browser/browser_view_renderer.h" | 8 #include "android_webview/browser/browser_view_renderer.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/lib/aw_browser_dependency_factory_impl.h" | 10 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "base/memory/scoped_ptr.h" | 21 #include "base/memory/scoped_ptr.h" |
22 #include "base/threading/thread_restrictions.h" | 22 #include "base/threading/thread_restrictions.h" |
23 #include "cc/base/switches.h" | 23 #include "cc/base/switches.h" |
24 #include "content/browser/media/android/browser_media_player_manager.h" | 24 #include "content/browser/media/android/browser_media_player_manager.h" |
25 #include "content/public/browser/browser_main_runner.h" | 25 #include "content/public/browser/browser_main_runner.h" |
26 #include "content/public/browser/browser_thread.h" | 26 #include "content/public/browser/browser_thread.h" |
27 #include "content/public/common/content_switches.h" | 27 #include "content/public/common/content_switches.h" |
28 #include "gpu/command_buffer/client/gl_in_process_context.h" | 28 #include "gpu/command_buffer/client/gl_in_process_context.h" |
29 #include "gpu/command_buffer/service/gpu_switches.h" | 29 #include "gpu/command_buffer/service/gpu_switches.h" |
30 #include "media/base/media_switches.h" | 30 #include "media/base/media_switches.h" |
31 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.
h" | |
32 | 31 |
33 namespace android_webview { | 32 namespace android_webview { |
34 | 33 |
35 namespace { | 34 namespace { |
36 | 35 |
37 // TODO(boliu): Remove this global Allow once the underlying issues are | 36 // TODO(boliu): Remove this global Allow once the underlying issues are |
38 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below. | 37 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below. |
39 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> > | 38 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> > |
40 g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER; | 39 g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER; |
41 | 40 |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 | 157 |
159 #if defined(VIDEO_HOLE) | 158 #if defined(VIDEO_HOLE) |
160 content::ExternalVideoSurfaceContainer* | 159 content::ExternalVideoSurfaceContainer* |
161 AwMainDelegate::CreateExternalVideoSurfaceContainer( | 160 AwMainDelegate::CreateExternalVideoSurfaceContainer( |
162 content::WebContents* web_contents) { | 161 content::WebContents* web_contents) { |
163 return new ExternalVideoSurfaceContainerImpl(web_contents); | 162 return new ExternalVideoSurfaceContainerImpl(web_contents); |
164 } | 163 } |
165 #endif | 164 #endif |
166 | 165 |
167 } // namespace android_webview | 166 } // namespace android_webview |
OLD | NEW |