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 <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 #include "net/cookies/cookie_monster.h" | 138 #include "net/cookies/cookie_monster.h" |
139 #include "net/http/http_network_layer.h" | 139 #include "net/http/http_network_layer.h" |
140 #include "net/http/http_stream_factory.h" | 140 #include "net/http/http_stream_factory.h" |
141 #include "net/url_request/url_request.h" | 141 #include "net/url_request/url_request.h" |
142 #include "ui/base/l10n/l10n_util.h" | 142 #include "ui/base/l10n/l10n_util.h" |
143 #include "ui/base/layout.h" | 143 #include "ui/base/layout.h" |
144 #include "ui/base/resource/resource_bundle.h" | 144 #include "ui/base/resource/resource_bundle.h" |
145 #include "ui/strings/grit/app_locale_settings.h" | 145 #include "ui/strings/grit/app_locale_settings.h" |
146 | 146 |
147 #if defined(OS_ANDROID) | 147 #if defined(OS_ANDROID) |
| 148 #include "chrome/browser/android/dev_tools_discovery_provider_android.h" |
148 #include "chrome/browser/metrics/thread_watcher_android.h" | 149 #include "chrome/browser/metrics/thread_watcher_android.h" |
149 #else | 150 #else |
150 #include "chrome/browser/feedback/feedback_profile_observer.h" | 151 #include "chrome/browser/feedback/feedback_profile_observer.h" |
151 #endif // defined(OS_ANDROID) | 152 #endif // defined(OS_ANDROID) |
152 | 153 |
153 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 154 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
154 #include "chrome/browser/first_run/upgrade_util_linux.h" | 155 #include "chrome/browser/first_run/upgrade_util_linux.h" |
155 #include "chrome/browser/sxs_linux.h" | 156 #include "chrome/browser/sxs_linux.h" |
156 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) | 157 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) |
157 | 158 |
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1086 javascript_dialog_extensions_client::InstallClient(); | 1087 javascript_dialog_extensions_client::InstallClient(); |
1087 #endif // defined(ENABLE_EXTENSIONS) | 1088 #endif // defined(ENABLE_EXTENSIONS) |
1088 | 1089 |
1089 #if !defined(OS_IOS) | 1090 #if !defined(OS_IOS) |
1090 InstallChromeJavaScriptNativeDialogFactory(); | 1091 InstallChromeJavaScriptNativeDialogFactory(); |
1091 #endif // !defined(OS_IOS) | 1092 #endif // !defined(OS_IOS) |
1092 } | 1093 } |
1093 | 1094 |
1094 void ChromeBrowserMainParts::PostProfileInit() { | 1095 void ChromeBrowserMainParts::PostProfileInit() { |
1095 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); | 1096 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); |
| 1097 |
| 1098 #if defined(OS_ANDROID) |
| 1099 DevToolsDiscoveryProviderAndroid::Install(); |
| 1100 #endif // defined(OS_ANDROID) |
| 1101 |
1096 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); | 1102 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); |
1097 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1103 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
1098 chrome_extra_parts_[i]->PostProfileInit(); | 1104 chrome_extra_parts_[i]->PostProfileInit(); |
1099 } | 1105 } |
1100 | 1106 |
1101 void ChromeBrowserMainParts::PreBrowserStart() { | 1107 void ChromeBrowserMainParts::PreBrowserStart() { |
1102 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart"); | 1108 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart"); |
1103 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1109 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
1104 chrome_extra_parts_[i]->PreBrowserStart(); | 1110 chrome_extra_parts_[i]->PreBrowserStart(); |
1105 | 1111 |
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1766 chromeos::CrosSettings::Shutdown(); | 1772 chromeos::CrosSettings::Shutdown(); |
1767 #endif // defined(OS_CHROMEOS) | 1773 #endif // defined(OS_CHROMEOS) |
1768 #endif // defined(OS_ANDROID) | 1774 #endif // defined(OS_ANDROID) |
1769 } | 1775 } |
1770 | 1776 |
1771 // Public members: | 1777 // Public members: |
1772 | 1778 |
1773 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1779 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1774 chrome_extra_parts_.push_back(parts); | 1780 chrome_extra_parts_.push_back(parts); |
1775 } | 1781 } |
OLD | NEW |