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

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

Issue 2200693002: Refactor CrashDump*Manager to use a shared CrashDumpObserver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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"
(...skipping 13 matching lines...) Expand all
24 #include "android_webview/common/aw_switches.h" 24 #include "android_webview/common/aw_switches.h"
25 #include "android_webview/common/render_view_messages.h" 25 #include "android_webview/common/render_view_messages.h"
26 #include "android_webview/common/url_constants.h" 26 #include "android_webview/common/url_constants.h"
27 #include "base/android/locale_utils.h" 27 #include "base/android/locale_utils.h"
28 #include "base/base_paths_android.h" 28 #include "base/base_paths_android.h"
29 #include "base/command_line.h" 29 #include "base/command_line.h"
30 #include "base/files/scoped_file.h" 30 #include "base/files/scoped_file.h"
31 #include "base/memory/ptr_util.h" 31 #include "base/memory/ptr_util.h"
32 #include "base/path_service.h" 32 #include "base/path_service.h"
33 #include "components/cdm/browser/cdm_message_filter_android.h" 33 #include "components/cdm/browser/cdm_message_filter_android.h"
34 #include "components/crash/content/browser/crash_micro_dump_manager_android.h" 34 #include "components/crash/content/browser/crash_dump_observer_android.h"
35 #include "components/navigation_interception/intercept_navigation_delegate.h" 35 #include "components/navigation_interception/intercept_navigation_delegate.h"
36 #include "content/public/browser/browser_message_filter.h" 36 #include "content/public/browser/browser_message_filter.h"
37 #include "content/public/browser/browser_thread.h" 37 #include "content/public/browser/browser_thread.h"
38 #include "content/public/browser/child_process_security_policy.h" 38 #include "content/public/browser/child_process_security_policy.h"
39 #include "content/public/browser/client_certificate_delegate.h" 39 #include "content/public/browser/client_certificate_delegate.h"
40 #include "content/public/browser/navigation_handle.h" 40 #include "content/public/browser/navigation_handle.h"
41 #include "content/public/browser/navigation_throttle.h" 41 #include "content/public/browser/navigation_throttle.h"
42 #include "content/public/browser/render_frame_host.h" 42 #include "content/public/browser/render_frame_host.h"
43 #include "content/public/browser/render_process_host.h" 43 #include "content/public/browser/render_process_host.h"
44 #include "content/public/browser/render_view_host.h" 44 #include "content/public/browser/render_view_host.h"
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 int child_process_id, 470 int child_process_id,
471 content::FileDescriptorInfo* mappings, 471 content::FileDescriptorInfo* mappings,
472 std::map<int, base::MemoryMappedFile::Region>* regions) { 472 std::map<int, base::MemoryMappedFile::Region>* regions) {
473 int fd = ui::GetMainAndroidPackFd( 473 int fd = ui::GetMainAndroidPackFd(
474 &(*regions)[kAndroidWebViewMainPakDescriptor]); 474 &(*regions)[kAndroidWebViewMainPakDescriptor]);
475 mappings->Share(kAndroidWebViewMainPakDescriptor, fd); 475 mappings->Share(kAndroidWebViewMainPakDescriptor, fd);
476 476
477 fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]); 477 fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]);
478 mappings->Share(kAndroidWebViewLocalePakDescriptor, fd); 478 mappings->Share(kAndroidWebViewLocalePakDescriptor, fd);
479 479
480 base::ScopedFD crash_signal_file = 480 breakpad::CrashDumpObserver::GetInstance()->BrowserChildProcessStarted(
481 breakpad::CrashMicroDumpManager::GetInstance()->CreateCrashInfoChannel( 481 child_process_id, mappings);
482 child_process_id);
483 if (crash_signal_file.is_valid()) {
484 mappings->Transfer(kAndroidWebViewCrashSignalDescriptor,
485 std::move(crash_signal_file));
486 }
487 } 482 }
488 483
489 void AwContentBrowserClient::OverrideWebkitPrefs( 484 void AwContentBrowserClient::OverrideWebkitPrefs(
490 content::RenderViewHost* rvh, 485 content::RenderViewHost* rvh,
491 content::WebPreferences* web_prefs) { 486 content::WebPreferences* web_prefs) {
492 if (!preferences_populater_.get()) { 487 if (!preferences_populater_.get()) {
493 preferences_populater_ = 488 preferences_populater_ =
494 base::WrapUnique(native_factory_->CreateWebPreferencesPopulater()); 489 base::WrapUnique(native_factory_->CreateWebPreferencesPopulater());
495 } 490 }
496 preferences_populater_->PopulateFor( 491 preferences_populater_->PopulateFor(
(...skipping 17 matching lines...) Expand all
514 509
515 #if defined(VIDEO_HOLE) 510 #if defined(VIDEO_HOLE)
516 content::ExternalVideoSurfaceContainer* 511 content::ExternalVideoSurfaceContainer*
517 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 512 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
518 content::WebContents* web_contents) { 513 content::WebContents* web_contents) {
519 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 514 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
520 } 515 }
521 #endif 516 #endif
522 517
523 } // namespace android_webview 518 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698