Chromium Code Reviews| 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/base_switches.h" | 8 #include "base/base_switches.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 65 if (!breakpad_enabled) | 65 if (!breakpad_enabled) |
| 66 breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch( | 66 breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 67 switches::kEnableCrashReporterForTesting); | 67 switches::kEnableCrashReporterForTesting); |
| 68 | 68 |
| 69 if (breakpad_enabled) { | 69 if (breakpad_enabled) { |
| 70 base::FilePath crash_dump_dir; | 70 base::FilePath crash_dump_dir; |
| 71 PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); | 71 PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); |
| 72 crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir)); | 72 crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir)); |
| 73 } | 73 } |
| 74 | 74 |
| 75 bool has_language_splits = | 75 ui::SetLocalePaksStoredInApk(false); |
| 76 base::android::BuildInfo::GetInstance()->has_language_apk_splits(); | |
|
Lei Zhang
2016/05/10 20:30:21
Remove the base/android/build_info.h include as we
Yaron
2016/05/12 14:26:21
Done.
| |
| 77 ui::SetLocalePaksStoredInApk(has_language_splits); | |
| 78 | 76 |
| 79 return ChromeBrowserMainParts::PreCreateThreads(); | 77 return ChromeBrowserMainParts::PreCreateThreads(); |
| 80 } | 78 } |
| 81 | 79 |
| 82 void ChromeBrowserMainPartsAndroid::PostProfileInit() { | 80 void ChromeBrowserMainPartsAndroid::PostProfileInit() { |
| 83 ChromeBrowserMainParts::PostProfileInit(); | 81 ChromeBrowserMainParts::PostProfileInit(); |
| 84 | 82 |
| 85 // Previously we stored information related to salient images for bookmarks | 83 // Previously we stored information related to salient images for bookmarks |
| 86 // in a local file. We replaced the salient images with favicons. As part | 84 // in a local file. We replaced the salient images with favicons. As part |
| 87 // of the clean up, the local file needs to be deleted. See crbug.com/499415. | 85 // of the clean up, the local file needs to be deleted. See crbug.com/499415. |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 132 ChromeBrowserMainParts::PostBrowserStart(); | 130 ChromeBrowserMainParts::PostBrowserStart(); |
| 133 | 131 |
| 134 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, | 132 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, |
| 135 base::Bind(&SeccompSupportDetector::StartDetection), | 133 base::Bind(&SeccompSupportDetector::StartDetection), |
| 136 base::TimeDelta::FromMinutes(1)); | 134 base::TimeDelta::FromMinutes(1)); |
| 137 } | 135 } |
| 138 | 136 |
| 139 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { | 137 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { |
| 140 NOTREACHED(); | 138 NOTREACHED(); |
| 141 } | 139 } |
| OLD | NEW |