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/android/build_info.h" | 7 #include "base/android/build_info.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" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 if (!breakpad_enabled) | 67 if (!breakpad_enabled) |
68 breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch( | 68 breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch( |
69 switches::kEnableCrashReporterForTesting); | 69 switches::kEnableCrashReporterForTesting); |
70 | 70 |
71 if (breakpad_enabled) { | 71 if (breakpad_enabled) { |
72 base::FilePath crash_dump_dir; | 72 base::FilePath crash_dump_dir; |
73 PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); | 73 PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); |
74 crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir)); | 74 crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir)); |
75 } | 75 } |
76 | 76 |
77 bool has_splits = base::android::BuildInfo::GetInstance()->has_apk_splits(); | 77 bool has_language_splits = |
78 ui::SetLocalePaksStoredInApk(has_splits); | 78 base::android::BuildInfo::GetInstance()->has_language_apk_splits(); |
| 79 ui::SetLocalePaksStoredInApk(has_language_splits); |
79 | 80 |
80 return ChromeBrowserMainParts::PreCreateThreads(); | 81 return ChromeBrowserMainParts::PreCreateThreads(); |
81 } | 82 } |
82 | 83 |
83 void ChromeBrowserMainPartsAndroid::PostProfileInit() { | 84 void ChromeBrowserMainPartsAndroid::PostProfileInit() { |
84 Profile* main_profile = profile(); | 85 Profile* main_profile = profile(); |
85 search_counter_.reset(new GoogleSearchCounterAndroid(main_profile)); | 86 search_counter_.reset(new GoogleSearchCounterAndroid(main_profile)); |
86 | 87 |
87 ChromeBrowserMainParts::PostProfileInit(); | 88 ChromeBrowserMainParts::PostProfileInit(); |
88 | 89 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 ChromeBrowserMainParts::PostBrowserStart(); | 138 ChromeBrowserMainParts::PostBrowserStart(); |
138 | 139 |
139 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, | 140 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, |
140 base::Bind(&SeccompSupportDetector::StartDetection), | 141 base::Bind(&SeccompSupportDetector::StartDetection), |
141 base::TimeDelta::FromMinutes(1)); | 142 base::TimeDelta::FromMinutes(1)); |
142 } | 143 } |
143 | 144 |
144 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { | 145 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { |
145 NOTREACHED(); | 146 NOTREACHED(); |
146 } | 147 } |
OLD | NEW |