| 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" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "base/trace_event/trace_event.h" | 12 #include "base/trace_event/trace_event.h" |
| 13 #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h" | 13 #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h" |
| 14 #include "chrome/browser/android/seccomp_support_detector.h" | 14 #include "chrome/browser/android/seccomp_support_detector.h" |
| 15 #include "chrome/browser/signin/signin_manager_factory.h" | 15 #include "chrome/browser/signin/signin_manager_factory.h" |
| 16 #include "chrome/common/chrome_paths.h" | 16 #include "chrome/common/chrome_paths.h" |
| 17 #include "components/crash/content/app/breakpad_linux.h" | 17 #include "components/crash/content/app/breakpad_linux.h" |
| 18 #include "components/crash/content/browser/crash_dump_manager_android.h" | 18 #include "components/crash/content/browser/crash_dump_manager_android.h" |
| 19 #include "components/signin/core/browser/signin_manager.h" | 19 #include "components/signin/core/browser/signin_manager.h" |
| 20 #include "content/public/browser/android/compositor.h" | 20 #include "content/public/browser/android/compositor.h" |
| 21 #include "content/public/browser/browser_thread.h" | 21 #include "content/public/browser/browser_thread.h" |
| 22 #include "content/public/common/main_function_params.h" | 22 #include "content/public/common/main_function_params.h" |
| 23 #include "net/android/network_change_notifier_factory_android.h" | 23 #include "net/android/network_change_notifier_factory_android.h" |
| 24 #include "net/base/network_change_notifier.h" | 24 #include "net/base/network_change_notifier.h" |
| 25 #include "ui/android/screen_android.h" |
| 25 #include "ui/base/resource/resource_bundle_android.h" | 26 #include "ui/base/resource/resource_bundle_android.h" |
| 26 #include "ui/base/ui_base_paths.h" | 27 #include "ui/base/ui_base_paths.h" |
| 28 #include "ui/display/screen.h" |
| 27 | 29 |
| 28 namespace { | 30 namespace { |
| 29 | 31 |
| 30 void DeleteFileTask( | 32 void DeleteFileTask( |
| 31 const base::FilePath& file_path) { | 33 const base::FilePath& file_path) { |
| 32 if (base::PathExists(file_path)) | 34 if (base::PathExists(file_path)) |
| 33 base::DeleteFile(file_path, false); | 35 base::DeleteFile(file_path, false); |
| 34 } | 36 } |
| 35 | 37 |
| 36 } // namespace | 38 } // namespace |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 base::FilePath crash_dump_dir; | 70 base::FilePath crash_dump_dir; |
| 69 PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); | 71 PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); |
| 70 crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir)); | 72 crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir)); |
| 71 } | 73 } |
| 72 | 74 |
| 73 // Auto-detect based on en-US whether locale .pak files are store uncompressed | 75 // Auto-detect based on en-US whether locale .pak files are store uncompressed |
| 74 // (monochrome) vs extracted (non-monochrome). | 76 // (monochrome) vs extracted (non-monochrome). |
| 75 ui::SetLocalePaksStoredInApk( | 77 ui::SetLocalePaksStoredInApk( |
| 76 !ui::GetPathForAndroidLocalePakWithinApk("en-US").empty()); | 78 !ui::GetPathForAndroidLocalePakWithinApk("en-US").empty()); |
| 77 | 79 |
| 80 display::Screen::SetScreenInstance(ui::CreateScreenAndroid()); |
| 81 |
| 78 return ChromeBrowserMainParts::PreCreateThreads(); | 82 return ChromeBrowserMainParts::PreCreateThreads(); |
| 79 } | 83 } |
| 80 | 84 |
| 81 void ChromeBrowserMainPartsAndroid::PostProfileInit() { | 85 void ChromeBrowserMainPartsAndroid::PostProfileInit() { |
| 82 ChromeBrowserMainParts::PostProfileInit(); | 86 ChromeBrowserMainParts::PostProfileInit(); |
| 83 | 87 |
| 84 // Previously we stored information related to salient images for bookmarks | 88 // Previously we stored information related to salient images for bookmarks |
| 85 // in a local file. We replaced the salient images with favicons. As part | 89 // in a local file. We replaced the salient images with favicons. As part |
| 86 // of the clean up, the local file needs to be deleted. See crbug.com/499415. | 90 // of the clean up, the local file needs to be deleted. See crbug.com/499415. |
| 87 base::FilePath bookmark_image_file_path = | 91 base::FilePath bookmark_image_file_path = |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, | 131 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, |
| 128 base::Bind(&SeccompSupportDetector::StartDetection), | 132 base::Bind(&SeccompSupportDetector::StartDetection), |
| 129 base::TimeDelta::FromMinutes(1)); | 133 base::TimeDelta::FromMinutes(1)); |
| 130 | 134 |
| 131 RegisterChromeJavaMojoInterfaces(); | 135 RegisterChromeJavaMojoInterfaces(); |
| 132 } | 136 } |
| 133 | 137 |
| 134 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { | 138 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { |
| 135 NOTREACHED(); | 139 NOTREACHED(); |
| 136 } | 140 } |
| OLD | NEW |