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

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

Issue 937863003: Add AwAssets into android_webview/native/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just move aw_assets to public totally Created 5 years, 10 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
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/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/crash_reporter/aw_microdump_crash_reporter.h" 10 #include "android_webview/crash_reporter/aw_microdump_crash_reporter.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_assets.h"
13 #include "android_webview/native/aw_media_url_interceptor.h" 12 #include "android_webview/native/aw_media_url_interceptor.h"
14 #include "android_webview/native/aw_message_port_service_impl.h" 13 #include "android_webview/native/aw_message_port_service_impl.h"
15 #include "android_webview/native/aw_quota_manager_bridge_impl.h" 14 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
16 #include "android_webview/native/aw_web_contents_view_delegate.h" 15 #include "android_webview/native/aw_web_contents_view_delegate.h"
17 #include "android_webview/native/aw_web_preferences_populater_impl.h" 16 #include "android_webview/native/aw_web_preferences_populater_impl.h"
18 #include "android_webview/native/external_video_surface_container_impl.h" 17 #include "android_webview/native/external_video_surface_container_impl.h"
18 #include "android_webview/native/public/aw_assets.h"
19 #include "android_webview/renderer/aw_content_renderer_client.h" 19 #include "android_webview/renderer/aw_content_renderer_client.h"
20 #include "base/command_line.h" 20 #include "base/command_line.h"
21 #include "base/cpu.h" 21 #include "base/cpu.h"
22 #include "base/i18n/icu_util.h" 22 #include "base/i18n/icu_util.h"
23 #include "base/lazy_instance.h" 23 #include "base/lazy_instance.h"
24 #include "base/logging.h" 24 #include "base/logging.h"
25 #include "base/memory/scoped_ptr.h" 25 #include "base/memory/scoped_ptr.h"
26 #include "base/threading/thread_restrictions.h" 26 #include "base/threading/thread_restrictions.h"
27 #include "cc/base/switches.h" 27 #include "cc/base/switches.h"
28 #include "content/browser/media/android/browser_media_player_manager.h" 28 #include "content/browser/media/android/browser_media_player_manager.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 #if defined(VIDEO_HOLE) 196 #if defined(VIDEO_HOLE)
197 content::ExternalVideoSurfaceContainer* 197 content::ExternalVideoSurfaceContainer*
198 AwMainDelegate::CreateExternalVideoSurfaceContainer( 198 AwMainDelegate::CreateExternalVideoSurfaceContainer(
199 content::WebContents* web_contents) { 199 content::WebContents* web_contents) {
200 return new ExternalVideoSurfaceContainerImpl(web_contents); 200 return new ExternalVideoSurfaceContainerImpl(web_contents);
201 } 201 }
202 #endif 202 #endif
203 203
204 } // namespace android_webview 204 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/aw_browser_main_parts.cc ('k') | android_webview/native/android_webview_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698