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

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

Issue 2980773002: Revert of Deduplicate Monochrome locale .paks (Closed)
Patch Set: Created 3 years, 5 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/app/chrome_main_delegate.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('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 secondary locale .pak files exist.
84 ui::SetLoadSecondaryLocalePaks(
85 !ui::GetPathForAndroidLocalePakWithinApk("en-US").empty());
86
87 return ChromeBrowserMainParts::PreCreateThreads(); 83 return ChromeBrowserMainParts::PreCreateThreads();
88 } 84 }
89 85
90 void ChromeBrowserMainPartsAndroid::PostProfileInit() { 86 void ChromeBrowserMainPartsAndroid::PostProfileInit() {
91 ChromeBrowserMainParts::PostProfileInit(); 87 ChromeBrowserMainParts::PostProfileInit();
92 88
93 // Previously we stored information related to salient images for bookmarks 89 // Previously we stored information related to salient images for bookmarks
94 // in a local file. We replaced the salient images with favicons. As part 90 // in a local file. We replaced the salient images with favicons. As part
95 // of the clean up, the local file needs to be deleted. See crbug.com/499415. 91 // of the clean up, the local file needs to be deleted. See crbug.com/499415.
96 base::FilePath bookmark_image_file_path = 92 base::FilePath bookmark_image_file_path =
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 base::PostDelayedTaskWithTraits( 142 base::PostDelayedTaskWithTraits(
147 FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND}, 143 FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
148 base::Bind(&ReportSeccompSupport), base::TimeDelta::FromMinutes(1)); 144 base::Bind(&ReportSeccompSupport), base::TimeDelta::FromMinutes(1));
149 145
150 RegisterChromeJavaMojoInterfaces(); 146 RegisterChromeJavaMojoInterfaces();
151 } 147 }
152 148
153 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { 149 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() {
154 NOTREACHED(); 150 NOTREACHED();
155 } 151 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698