| 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.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 #include "net/cookies/cookie_monster.h" | 168 #include "net/cookies/cookie_monster.h" |
| 169 #include "net/http/http_network_layer.h" | 169 #include "net/http/http_network_layer.h" |
| 170 #include "net/http/http_stream_factory.h" | 170 #include "net/http/http_stream_factory.h" |
| 171 #include "net/url_request/url_request.h" | 171 #include "net/url_request/url_request.h" |
| 172 #include "ui/base/l10n/l10n_util.h" | 172 #include "ui/base/l10n/l10n_util.h" |
| 173 #include "ui/base/layout.h" | 173 #include "ui/base/layout.h" |
| 174 #include "ui/base/material_design/material_design_controller.h" | 174 #include "ui/base/material_design/material_design_controller.h" |
| 175 #include "ui/base/resource/resource_bundle.h" | 175 #include "ui/base/resource/resource_bundle.h" |
| 176 #include "ui/strings/grit/app_locale_settings.h" | 176 #include "ui/strings/grit/app_locale_settings.h" |
| 177 | 177 |
| 178 #if BUILDFLAG(ANDROID_JAVA_UI) | |
| 179 #include "chrome/browser/android/dev_tools_discovery_provider_android.h" | |
| 180 #else | |
| 181 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h" | |
| 182 #endif | |
| 183 | |
| 184 #if defined(OS_ANDROID) | 178 #if defined(OS_ANDROID) |
| 185 #include "chrome/browser/metrics/thread_watcher_android.h" | 179 #include "chrome/browser/metrics/thread_watcher_android.h" |
| 186 #include "ui/base/resource/resource_bundle_android.h" | 180 #include "ui/base/resource/resource_bundle_android.h" |
| 187 #else | 181 #else |
| 188 #include "chrome/browser/feedback/feedback_profile_observer.h" | 182 #include "chrome/browser/feedback/feedback_profile_observer.h" |
| 189 #endif // defined(OS_ANDROID) | 183 #endif // defined(OS_ANDROID) |
| 190 | 184 |
| 191 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 185 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 192 #include "chrome/browser/first_run/upgrade_util_linux.h" | 186 #include "chrome/browser/first_run/upgrade_util_linux.h" |
| 193 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) | 187 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| (...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1422 | 1416 |
| 1423 #if defined(ENABLE_EXTENSIONS) | 1417 #if defined(ENABLE_EXTENSIONS) |
| 1424 javascript_dialog_extensions_client::InstallClient(); | 1418 javascript_dialog_extensions_client::InstallClient(); |
| 1425 #endif // defined(ENABLE_EXTENSIONS) | 1419 #endif // defined(ENABLE_EXTENSIONS) |
| 1426 | 1420 |
| 1427 InstallChromeJavaScriptNativeDialogFactory(); | 1421 InstallChromeJavaScriptNativeDialogFactory(); |
| 1428 } | 1422 } |
| 1429 | 1423 |
| 1430 void ChromeBrowserMainParts::PostProfileInit() { | 1424 void ChromeBrowserMainParts::PostProfileInit() { |
| 1431 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); | 1425 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); |
| 1432 | |
| 1433 #if BUILDFLAG(ANDROID_JAVA_UI) | |
| 1434 DevToolsDiscoveryProviderAndroid::Install(); | |
| 1435 #else | |
| 1436 ChromeDevToolsDiscoveryProvider::Install(); | |
| 1437 #endif // BUILDFLAG(ANDROID_JAVA_UI) | |
| 1438 | |
| 1439 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); | 1426 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); |
| 1440 if (parsed_command_line().HasSwitch(::switches::kAutoOpenDevToolsForTabs)) | 1427 if (parsed_command_line().HasSwitch(::switches::kAutoOpenDevToolsForTabs)) |
| 1441 g_browser_process->CreateDevToolsAutoOpener(); | 1428 g_browser_process->CreateDevToolsAutoOpener(); |
| 1442 | 1429 |
| 1443 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1430 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
| 1444 chrome_extra_parts_[i]->PostProfileInit(); | 1431 chrome_extra_parts_[i]->PostProfileInit(); |
| 1445 } | 1432 } |
| 1446 | 1433 |
| 1447 #if defined(SYZYASAN) | 1434 #if defined(SYZYASAN) |
| 1448 | 1435 |
| (...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2224 chromeos::CrosSettings::Shutdown(); | 2211 chromeos::CrosSettings::Shutdown(); |
| 2225 #endif // defined(OS_CHROMEOS) | 2212 #endif // defined(OS_CHROMEOS) |
| 2226 #endif // defined(OS_ANDROID) | 2213 #endif // defined(OS_ANDROID) |
| 2227 } | 2214 } |
| 2228 | 2215 |
| 2229 // Public members: | 2216 // Public members: |
| 2230 | 2217 |
| 2231 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2218 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2232 chrome_extra_parts_.push_back(parts); | 2219 chrome_extra_parts_.push_back(parts); |
| 2233 } | 2220 } |
| OLD | NEW |