| 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" |  | 
|    8 #include "base/base_switches.h" |    7 #include "base/base_switches.h" | 
|    9 #include "base/command_line.h" |    8 #include "base/command_line.h" | 
|   10 #include "base/files/file_path.h" |    9 #include "base/files/file_path.h" | 
|   11 #include "base/files/file_util.h" |   10 #include "base/files/file_util.h" | 
|   12 #include "base/path_service.h" |   11 #include "base/path_service.h" | 
|   13 #include "base/trace_event/trace_event.h" |   12 #include "base/trace_event/trace_event.h" | 
|   14 #include "chrome/browser/android/seccomp_support_detector.h" |   13 #include "chrome/browser/android/seccomp_support_detector.h" | 
|   15 #include "chrome/browser/signin/signin_manager_factory.h" |   14 #include "chrome/browser/signin/signin_manager_factory.h" | 
|   16 #include "chrome/common/chrome_media_client_android.h" |   15 #include "chrome/common/chrome_media_client_android.h" | 
|   17 #include "chrome/common/chrome_paths.h" |   16 #include "chrome/common/chrome_paths.h" | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   65   if (!breakpad_enabled) |   64   if (!breakpad_enabled) | 
|   66     breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch( |   65     breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch( | 
|   67         switches::kEnableCrashReporterForTesting); |   66         switches::kEnableCrashReporterForTesting); | 
|   68  |   67  | 
|   69   if (breakpad_enabled) { |   68   if (breakpad_enabled) { | 
|   70     base::FilePath crash_dump_dir; |   69     base::FilePath crash_dump_dir; | 
|   71     PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); |   70     PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); | 
|   72     crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir)); |   71     crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir)); | 
|   73   } |   72   } | 
|   74  |   73  | 
|   75   bool has_language_splits = |   74   ui::SetLocalePaksStoredInApk(false); | 
|   76       base::android::BuildInfo::GetInstance()->has_language_apk_splits(); |  | 
|   77   ui::SetLocalePaksStoredInApk(has_language_splits); |  | 
|   78  |   75  | 
|   79   return ChromeBrowserMainParts::PreCreateThreads(); |   76   return ChromeBrowserMainParts::PreCreateThreads(); | 
|   80 } |   77 } | 
|   81  |   78  | 
|   82 void ChromeBrowserMainPartsAndroid::PostProfileInit() { |   79 void ChromeBrowserMainPartsAndroid::PostProfileInit() { | 
|   83   ChromeBrowserMainParts::PostProfileInit(); |   80   ChromeBrowserMainParts::PostProfileInit(); | 
|   84  |   81  | 
|   85   // Previously we stored information related to salient images for bookmarks |   82   // Previously we stored information related to salient images for bookmarks | 
|   86   // in a local file. We replaced the salient images with favicons. As part |   83   // 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. |   84   // 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(); |  129   ChromeBrowserMainParts::PostBrowserStart(); | 
|  133  |  130  | 
|  134   content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, |  131   content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, | 
|  135       base::Bind(&SeccompSupportDetector::StartDetection), |  132       base::Bind(&SeccompSupportDetector::StartDetection), | 
|  136       base::TimeDelta::FromMinutes(1)); |  133       base::TimeDelta::FromMinutes(1)); | 
|  137 } |  134 } | 
|  138  |  135  | 
|  139 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { |  136 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { | 
|  140   NOTREACHED(); |  137   NOTREACHED(); | 
|  141 } |  138 } | 
| OLD | NEW |