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" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 switches::kEnableCrashReporterForTesting); | 73 switches::kEnableCrashReporterForTesting); |
74 | 74 |
75 if (breakpad_enabled) { | 75 if (breakpad_enabled) { |
76 base::FilePath crash_dump_dir; | 76 base::FilePath crash_dump_dir; |
77 PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); | 77 PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); |
78 breakpad::CrashDumpObserver::GetInstance()->RegisterClient( | 78 breakpad::CrashDumpObserver::GetInstance()->RegisterClient( |
79 base::MakeUnique<breakpad::CrashDumpManager>( | 79 base::MakeUnique<breakpad::CrashDumpManager>( |
80 crash_dump_dir, kAndroidMinidumpDescriptor)); | 80 crash_dump_dir, kAndroidMinidumpDescriptor)); |
81 } | 81 } |
82 | 82 |
| 83 // Auto-detect based on en-US whether secondary locale .pak files exist. |
| 84 ui::SetLoadSecondaryLocalePaks( |
| 85 !ui::GetPathForAndroidLocalePakWithinApk("en-US").empty()); |
| 86 |
83 return ChromeBrowserMainParts::PreCreateThreads(); | 87 return ChromeBrowserMainParts::PreCreateThreads(); |
84 } | 88 } |
85 | 89 |
86 void ChromeBrowserMainPartsAndroid::PostProfileInit() { | 90 void ChromeBrowserMainPartsAndroid::PostProfileInit() { |
87 ChromeBrowserMainParts::PostProfileInit(); | 91 ChromeBrowserMainParts::PostProfileInit(); |
88 | 92 |
89 // Previously we stored information related to salient images for bookmarks | 93 // Previously we stored information related to salient images for bookmarks |
90 // in a local file. We replaced the salient images with favicons. As part | 94 // in a local file. We replaced the salient images with favicons. As part |
91 // of the clean up, the local file needs to be deleted. See crbug.com/499415. | 95 // of the clean up, the local file needs to be deleted. See crbug.com/499415. |
92 base::FilePath bookmark_image_file_path = | 96 base::FilePath bookmark_image_file_path = |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 base::PostDelayedTaskWithTraits( | 146 base::PostDelayedTaskWithTraits( |
143 FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND}, | 147 FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND}, |
144 base::Bind(&ReportSeccompSupport), base::TimeDelta::FromMinutes(1)); | 148 base::Bind(&ReportSeccompSupport), base::TimeDelta::FromMinutes(1)); |
145 | 149 |
146 RegisterChromeJavaMojoInterfaces(); | 150 RegisterChromeJavaMojoInterfaces(); |
147 } | 151 } |
148 | 152 |
149 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { | 153 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { |
150 NOTREACHED(); | 154 NOTREACHED(); |
151 } | 155 } |
OLD | NEW |