Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 1099243004: [DevTools] Migrate android to devtools_discovery. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 #include "net/cookies/cookie_monster.h" 136 #include "net/cookies/cookie_monster.h"
137 #include "net/http/http_network_layer.h" 137 #include "net/http/http_network_layer.h"
138 #include "net/http/http_stream_factory.h" 138 #include "net/http/http_stream_factory.h"
139 #include "net/url_request/url_request.h" 139 #include "net/url_request/url_request.h"
140 #include "ui/base/l10n/l10n_util.h" 140 #include "ui/base/l10n/l10n_util.h"
141 #include "ui/base/layout.h" 141 #include "ui/base/layout.h"
142 #include "ui/base/resource/resource_bundle.h" 142 #include "ui/base/resource/resource_bundle.h"
143 #include "ui/strings/grit/app_locale_settings.h" 143 #include "ui/strings/grit/app_locale_settings.h"
144 144
145 #if defined(OS_ANDROID) 145 #if defined(OS_ANDROID)
146 #include "chrome/browser/android/dev_tools_discovery_provider_android.h"
146 #include "chrome/browser/metrics/thread_watcher_android.h" 147 #include "chrome/browser/metrics/thread_watcher_android.h"
147 #else 148 #else
148 #include "chrome/browser/feedback/feedback_profile_observer.h" 149 #include "chrome/browser/feedback/feedback_profile_observer.h"
149 #endif // defined(OS_ANDROID) 150 #endif // defined(OS_ANDROID)
150 151
151 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 152 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
152 #include "chrome/browser/first_run/upgrade_util_linux.h" 153 #include "chrome/browser/first_run/upgrade_util_linux.h"
153 #include "chrome/browser/sxs_linux.h" 154 #include "chrome/browser/sxs_linux.h"
154 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) 155 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
155 156
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 g_browser_process->profile_manager()->user_data_dir(); 506 g_browser_process->profile_manager()->user_data_dir();
506 base::FilePath startup_profile_dir = 507 base::FilePath startup_profile_dir =
507 GetStartupProfilePath(user_data_dir, command_line); 508 GetStartupProfilePath(user_data_dir, command_line);
508 509
509 StartupBrowserCreator::ProcessCommandLineAlreadyRunning( 510 StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
510 command_line, current_directory, startup_profile_dir); 511 command_line, current_directory, startup_profile_dir);
511 return true; 512 return true;
512 } 513 }
513 #endif // !defined(OS_ANDROID) 514 #endif // !defined(OS_ANDROID)
514 515
516 void SetUpDevToolsDiscovery() {
517 #if defined(OS_ANDROID)
518 DevToolsDiscoveryProviderAndroid::Install();
519 #endif // defined(OS_ANDROID)
520 }
521
515 void LaunchDevToolsHandlerIfNeeded(const base::CommandLine& command_line) { 522 void LaunchDevToolsHandlerIfNeeded(const base::CommandLine& command_line) {
516 if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) { 523 if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) {
517 std::string port_str = 524 std::string port_str =
518 command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort); 525 command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort);
519 int port; 526 int port;
520 if (base::StringToInt(port_str, &port) && port >= 0 && port < 65535) { 527 if (base::StringToInt(port_str, &port) && port >= 0 && port < 65535) {
521 g_browser_process->CreateDevToolsHttpProtocolHandler( 528 g_browser_process->CreateDevToolsHttpProtocolHandler(
522 chrome::HOST_DESKTOP_TYPE_NATIVE, 529 chrome::HOST_DESKTOP_TYPE_NATIVE,
523 "127.0.0.1", 530 "127.0.0.1",
524 static_cast<uint16>(port)); 531 static_cast<uint16>(port));
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 javascript_dialog_extensions_client::InstallClient(); 1085 javascript_dialog_extensions_client::InstallClient();
1079 #endif // defined(ENABLE_EXTENSIONS) 1086 #endif // defined(ENABLE_EXTENSIONS)
1080 1087
1081 #if !defined(OS_IOS) 1088 #if !defined(OS_IOS)
1082 InstallChromeJavaScriptNativeDialogFactory(); 1089 InstallChromeJavaScriptNativeDialogFactory();
1083 #endif // !defined(OS_IOS) 1090 #endif // !defined(OS_IOS)
1084 } 1091 }
1085 1092
1086 void ChromeBrowserMainParts::PostProfileInit() { 1093 void ChromeBrowserMainParts::PostProfileInit() {
1087 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); 1094 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit");
1095 SetUpDevToolsDiscovery();
1088 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); 1096 LaunchDevToolsHandlerIfNeeded(parsed_command_line());
1089 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1097 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1090 chrome_extra_parts_[i]->PostProfileInit(); 1098 chrome_extra_parts_[i]->PostProfileInit();
1091 } 1099 }
1092 1100
1093 void ChromeBrowserMainParts::PreBrowserStart() { 1101 void ChromeBrowserMainParts::PreBrowserStart() {
1094 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart"); 1102 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart");
1095 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1103 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1096 chrome_extra_parts_[i]->PreBrowserStart(); 1104 chrome_extra_parts_[i]->PreBrowserStart();
1097 1105
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1755 chromeos::CrosSettings::Shutdown(); 1763 chromeos::CrosSettings::Shutdown();
1756 #endif // defined(OS_CHROMEOS) 1764 #endif // defined(OS_CHROMEOS)
1757 #endif // defined(OS_ANDROID) 1765 #endif // defined(OS_ANDROID)
1758 } 1766 }
1759 1767
1760 // Public members: 1768 // Public members:
1761 1769
1762 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1770 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1763 chrome_extra_parts_.push_back(parts); 1771 chrome_extra_parts_.push_back(parts);
1764 } 1772 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698