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

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

Issue 2072383002: Trace revision and v8 version for IterationInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: specific_include_rules tracing_controller_impl.cc +v8 Created 4 years, 5 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/browser/aw_content_browser_client.h" 5 #include "android_webview/browser/aw_content_browser_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "android_webview/browser/aw_browser_context.h" 9 #include "android_webview/browser/aw_browser_context.h"
10 #include "android_webview/browser/aw_browser_main_parts.h" 10 #include "android_webview/browser/aw_browser_main_parts.h"
11 #include "android_webview/browser/aw_contents_client_bridge_base.h" 11 #include "android_webview/browser/aw_contents_client_bridge_base.h"
12 #include "android_webview/browser/aw_contents_io_thread_client.h" 12 #include "android_webview/browser/aw_contents_io_thread_client.h"
13 #include "android_webview/browser/aw_cookie_access_policy.h" 13 #include "android_webview/browser/aw_cookie_access_policy.h"
14 #include "android_webview/browser/aw_locale_manager.h" 14 #include "android_webview/browser/aw_locale_manager.h"
15 #include "android_webview/browser/aw_printing_message_filter.h" 15 #include "android_webview/browser/aw_printing_message_filter.h"
16 #include "android_webview/browser/aw_quota_permission_context.h" 16 #include "android_webview/browser/aw_quota_permission_context.h"
17 #include "android_webview/browser/aw_web_preferences_populater.h" 17 #include "android_webview/browser/aw_web_preferences_populater.h"
18 #include "android_webview/browser/jni_dependency_factory.h" 18 #include "android_webview/browser/jni_dependency_factory.h"
19 #include "android_webview/browser/net/aw_url_request_context_getter.h" 19 #include "android_webview/browser/net/aw_url_request_context_getter.h"
20 #include "android_webview/browser/net_disk_cache_remover.h" 20 #include "android_webview/browser/net_disk_cache_remover.h"
21 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h" 21 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h"
22 #include "android_webview/browser/tracing/aw_tracing_delegate.h"
22 #include "android_webview/common/aw_descriptors.h" 23 #include "android_webview/common/aw_descriptors.h"
23 #include "android_webview/common/aw_switches.h" 24 #include "android_webview/common/aw_switches.h"
24 #include "android_webview/common/render_view_messages.h" 25 #include "android_webview/common/render_view_messages.h"
25 #include "android_webview/common/url_constants.h" 26 #include "android_webview/common/url_constants.h"
26 #include "base/android/locale_utils.h" 27 #include "base/android/locale_utils.h"
27 #include "base/base_paths_android.h" 28 #include "base/base_paths_android.h"
28 #include "base/command_line.h" 29 #include "base/command_line.h"
29 #include "base/files/scoped_file.h" 30 #include "base/files/scoped_file.h"
30 #include "base/memory/ptr_util.h" 31 #include "base/memory/ptr_util.h"
31 #include "base/path_service.h" 32 #include "base/path_service.h"
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 return false; 497 return false;
497 } 498 }
498 499
499 bool AwContentBrowserClient::IsPepperVpnProviderAPIAllowed( 500 bool AwContentBrowserClient::IsPepperVpnProviderAPIAllowed(
500 content::BrowserContext* browser_context, 501 content::BrowserContext* browser_context,
501 const GURL& url) { 502 const GURL& url) {
502 NOTREACHED() << "Android WebView does not support plugins"; 503 NOTREACHED() << "Android WebView does not support plugins";
503 return false; 504 return false;
504 } 505 }
505 506
507 content::TracingDelegate* AwContentBrowserClient::GetTracingDelegate() {
508 return new AwTracingDelegate();
509 }
510
506 void AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 511 void AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
507 const base::CommandLine& command_line, 512 const base::CommandLine& command_line,
508 int child_process_id, 513 int child_process_id,
509 content::FileDescriptorInfo* mappings, 514 content::FileDescriptorInfo* mappings,
510 std::map<int, base::MemoryMappedFile::Region>* regions) { 515 std::map<int, base::MemoryMappedFile::Region>* regions) {
511 int fd = ui::GetMainAndroidPackFd( 516 int fd = ui::GetMainAndroidPackFd(
512 &(*regions)[kAndroidWebViewMainPakDescriptor]); 517 &(*regions)[kAndroidWebViewMainPakDescriptor]);
513 mappings->Share(kAndroidWebViewMainPakDescriptor, fd); 518 mappings->Share(kAndroidWebViewMainPakDescriptor, fd);
514 519
515 fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]); 520 fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 557
553 #if defined(VIDEO_HOLE) 558 #if defined(VIDEO_HOLE)
554 content::ExternalVideoSurfaceContainer* 559 content::ExternalVideoSurfaceContainer*
555 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 560 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
556 content::WebContents* web_contents) { 561 content::WebContents* web_contents) {
557 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 562 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
558 } 563 }
559 #endif 564 #endif
560 565
561 } // namespace android_webview 566 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/aw_content_browser_client.h ('k') | android_webview/browser/tracing/aw_tracing_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698