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 "chrome/browser/chrome_browser_main_android.h" | 5 #include "chrome/browser/chrome_browser_main_android.h" |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/trace_event/trace_event.h" | 12 #include "base/trace_event/trace_event.h" |
13 #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h" | 13 #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h" |
14 #include "chrome/browser/android/seccomp_support_detector.h" | 14 #include "chrome/browser/android/seccomp_support_detector.h" |
15 #include "chrome/browser/signin/signin_manager_factory.h" | 15 #include "chrome/browser/signin/signin_manager_factory.h" |
16 #include "chrome/common/chrome_paths.h" | 16 #include "chrome/common/chrome_paths.h" |
| 17 #include "chrome/common/descriptors_android.h" |
17 #include "components/crash/content/app/breakpad_linux.h" | 18 #include "components/crash/content/app/breakpad_linux.h" |
18 #include "components/crash/content/browser/crash_dump_manager_android.h" | 19 #include "components/crash/content/browser/crash_dump_manager_android.h" |
19 #include "components/signin/core/browser/signin_manager.h" | 20 #include "components/signin/core/browser/signin_manager.h" |
20 #include "content/public/browser/android/compositor.h" | 21 #include "content/public/browser/android/compositor.h" |
21 #include "content/public/browser/browser_thread.h" | 22 #include "content/public/browser/browser_thread.h" |
22 #include "content/public/common/main_function_params.h" | 23 #include "content/public/common/main_function_params.h" |
23 #include "net/android/network_change_notifier_factory_android.h" | 24 #include "net/android/network_change_notifier_factory_android.h" |
24 #include "net/base/network_change_notifier.h" | 25 #include "net/base/network_change_notifier.h" |
25 #include "ui/base/resource/resource_bundle_android.h" | 26 #include "ui/base/resource/resource_bundle_android.h" |
26 #include "ui/base/ui_base_paths.h" | 27 #include "ui/base/ui_base_paths.h" |
(...skipping 12 matching lines...) Expand all Loading... |
39 const content::MainFunctionParams& parameters) | 40 const content::MainFunctionParams& parameters) |
40 : ChromeBrowserMainParts(parameters) { | 41 : ChromeBrowserMainParts(parameters) { |
41 } | 42 } |
42 | 43 |
43 ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() { | 44 ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() { |
44 } | 45 } |
45 | 46 |
46 int ChromeBrowserMainPartsAndroid::PreCreateThreads() { | 47 int ChromeBrowserMainPartsAndroid::PreCreateThreads() { |
47 TRACE_EVENT0("startup", "ChromeBrowserMainPartsAndroid::PreCreateThreads") | 48 TRACE_EVENT0("startup", "ChromeBrowserMainPartsAndroid::PreCreateThreads") |
48 | 49 |
49 // The CrashDumpManager must be initialized before any child process is | 50 // The CrashDumpManager must be registered before any child process is |
50 // created (as they need to access it during creation). Such processes | 51 // created (as it needs to be notified during child process |
51 // are created on the PROCESS_LAUNCHER thread, and so the manager is | 52 // creation). Such processes are created on the PROCESS_LAUNCHER |
52 // initialized before that thread is created. | 53 // thread, and so the observer is initialized and the manager |
| 54 // registered before that thread is created. |
| 55 breakpad::CrashDumpObserver::Create(); |
| 56 |
53 #if defined(GOOGLE_CHROME_BUILD) | 57 #if defined(GOOGLE_CHROME_BUILD) |
54 // TODO(jcivelli): we should not initialize the crash-reporter when it was not | 58 // TODO(jcivelli): we should not initialize the crash-reporter when it was not |
55 // enabled. Right now if it is disabled we still generate the minidumps but we | 59 // enabled. Right now if it is disabled we still generate the minidumps but we |
56 // do not upload them. | 60 // do not upload them. |
57 bool breakpad_enabled = true; | 61 bool breakpad_enabled = true; |
58 #else | 62 #else |
59 bool breakpad_enabled = false; | 63 bool breakpad_enabled = false; |
60 #endif | 64 #endif |
61 | 65 |
62 // Allow Breakpad to be enabled in Chromium builds for testing purposes. | 66 // Allow Breakpad to be enabled in Chromium builds for testing purposes. |
63 if (!breakpad_enabled) | 67 if (!breakpad_enabled) |
64 breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch( | 68 breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch( |
65 switches::kEnableCrashReporterForTesting); | 69 switches::kEnableCrashReporterForTesting); |
66 | 70 |
67 if (breakpad_enabled) { | 71 if (breakpad_enabled) { |
68 base::FilePath crash_dump_dir; | 72 base::FilePath crash_dump_dir; |
69 PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); | 73 PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); |
70 crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir)); | 74 breakpad::CrashDumpObserver::GetInstance()->RegisterClient( |
| 75 base::MakeUnique<breakpad::CrashDumpManager>( |
| 76 crash_dump_dir, kAndroidMinidumpDescriptor)); |
71 } | 77 } |
72 | 78 |
73 // Auto-detect based on en-US whether locale .pak files are store uncompressed | 79 // Auto-detect based on en-US whether locale .pak files are store uncompressed |
74 // (monochrome) vs extracted (non-monochrome). | 80 // (monochrome) vs extracted (non-monochrome). |
75 ui::SetLocalePaksStoredInApk( | 81 ui::SetLocalePaksStoredInApk( |
76 !ui::GetPathForAndroidLocalePakWithinApk("en-US").empty()); | 82 !ui::GetPathForAndroidLocalePakWithinApk("en-US").empty()); |
77 | 83 |
78 return ChromeBrowserMainParts::PreCreateThreads(); | 84 return ChromeBrowserMainParts::PreCreateThreads(); |
79 } | 85 } |
80 | 86 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, | 136 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, |
131 base::Bind(&SeccompSupportDetector::StartDetection), | 137 base::Bind(&SeccompSupportDetector::StartDetection), |
132 base::TimeDelta::FromMinutes(1)); | 138 base::TimeDelta::FromMinutes(1)); |
133 | 139 |
134 RegisterChromeJavaMojoInterfaces(); | 140 RegisterChromeJavaMojoInterfaces(); |
135 } | 141 } |
136 | 142 |
137 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { | 143 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { |
138 NOTREACHED(); | 144 NOTREACHED(); |
139 } | 145 } |
OLD | NEW |