| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index a8c1b1f92f9ddcf4c3092a29ea7d1d551eebaf46..622c3ed7b8e683ba23f8818ba3f0bc27a61bab33 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -143,6 +143,7 @@
|
| #include "ui/strings/grit/app_locale_settings.h"
|
|
|
| #if defined(OS_ANDROID)
|
| +#include "chrome/browser/android/dev_tools_discovery_provider_android.h"
|
| #include "chrome/browser/metrics/thread_watcher_android.h"
|
| #else
|
| #include "chrome/browser/feedback/feedback_profile_observer.h"
|
| @@ -512,6 +513,12 @@ bool ProcessSingletonNotificationCallback(
|
| }
|
| #endif // !defined(OS_ANDROID)
|
|
|
| +void SetUpDevToolsDiscovery() {
|
| +#if defined(OS_ANDROID)
|
| + DevToolsDiscoveryProviderAndroid::Install();
|
| +#endif // defined(OS_ANDROID)
|
| +}
|
| +
|
| void LaunchDevToolsHandlerIfNeeded(const base::CommandLine& command_line) {
|
| if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) {
|
| std::string port_str =
|
| @@ -1085,6 +1092,7 @@ void ChromeBrowserMainParts::PreProfileInit() {
|
|
|
| void ChromeBrowserMainParts::PostProfileInit() {
|
| TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit");
|
| + SetUpDevToolsDiscovery();
|
| LaunchDevToolsHandlerIfNeeded(parsed_command_line());
|
| for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
|
| chrome_extra_parts_[i]->PostProfileInit();
|
|
|