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

Side by Side Diff: chrome/browser/chrome_browser_main_android.cc

Issue 2894763002: Revert of Separate WebView's locale paks from Chrome's locale paks (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/chrome_paks.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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
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 locale .pak files are store uncompressed
84 // (monochrome) vs extracted (non-monochrome).
85 ui::SetLocalePaksStoredInApk(
86 !ui::GetPathForAndroidLocalePakWithinApk("en-US").empty());
87
83 return ChromeBrowserMainParts::PreCreateThreads(); 88 return ChromeBrowserMainParts::PreCreateThreads();
84 } 89 }
85 90
86 void ChromeBrowserMainPartsAndroid::PostProfileInit() { 91 void ChromeBrowserMainPartsAndroid::PostProfileInit() {
87 ChromeBrowserMainParts::PostProfileInit(); 92 ChromeBrowserMainParts::PostProfileInit();
88 93
89 // Previously we stored information related to salient images for bookmarks 94 // Previously we stored information related to salient images for bookmarks
90 // in a local file. We replaced the salient images with favicons. As part 95 // 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. 96 // of the clean up, the local file needs to be deleted. See crbug.com/499415.
92 base::FilePath bookmark_image_file_path = 97 base::FilePath bookmark_image_file_path =
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 base::PostDelayedTaskWithTraits( 147 base::PostDelayedTaskWithTraits(
143 FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND}, 148 FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
144 base::Bind(&ReportSeccompSupport), base::TimeDelta::FromMinutes(1)); 149 base::Bind(&ReportSeccompSupport), base::TimeDelta::FromMinutes(1));
145 150
146 RegisterChromeJavaMojoInterfaces(); 151 RegisterChromeJavaMojoInterfaces();
147 } 152 }
148 153
149 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { 154 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() {
150 NOTREACHED(); 155 NOTREACHED();
151 } 156 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/chrome_paks.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698