Moved dev tools initialization bit earlier for ChromeOS browser start.

chrome/browser/ui/startup/startup_browser_creator_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 311 matching lines @@
     : cur_dir_(cur_dir),
       command_line_(command_line),
       profile_(NULL),
       browser_creator_(browser_creator),
       is_first_run_(is_first_run == chrome::startup::IS_FIRST_RUN) {
 }
 
 StartupBrowserCreatorImpl::~StartupBrowserCreatorImpl() {
 }
 
+

[sky, 2012/12/04 00:10:53]

remove newline.

[zel, 2012/12/04 02:12:28]

Done.

 bool StartupBrowserCreatorImpl::Launch(Profile* profile,
                                        const std::vector<GURL>& urls_to_open,
                                        bool process_startup) {
   DCHECK(profile);
   profile_ = profile;
 
   if (command_line_.HasSwitch(switches::kDnsLogDetails))
     chrome_browser_net::EnablePredictorDetailedLog(true);
   if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) &&
       profile->GetNetworkPredictor()) {
     profile->GetNetworkPredictor()->EnablePredictor(false);
   }
 
   if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit))
     base::StatisticsRecorder::set_dump_on_exit(true);
 
-  if (command_line_.HasSwitch(switches::kRemoteDebuggingPort)) {
-    std::string port_str =
-        command_line_.GetSwitchValueASCII(switches::kRemoteDebuggingPort);
-    int64 port;
-    if (base::StringToInt64(port_str, &port) && port > 0 && port < 65535) {
-      std::string frontend_str;
-      if (command_line_.HasSwitch(switches::kRemoteDebuggingFrontend)) {
-        frontend_str = command_line_.GetSwitchValueASCII(
-            switches::kRemoteDebuggingFrontend);
-      }
-      g_browser_process->CreateDevToolsHttpProtocolHandler(
-          profile,
-          "127.0.0.1",
-          static_cast<int>(port),
-          frontend_str);
-    } else {
-      DLOG(WARNING) << "Invalid http debugger port number " << port;
-    }
-  }
+#if !defined(OS_CHROMEOS)
+  LaunchDevToolsHandlerIfNeeded(profile, command_line_);
+#endif
 
 #if defined(ENABLE_APP_LIST)
   app_list_controller::CheckAppListTaskbarShortcut();
   if (command_line_.HasSwitch(switches::kShowAppList)) {
     app_list_controller::ShowAppList();
     return true;
   }
 #endif
 
   // Open the required browser windows and tabs. First, see if
@@ skipping 669 matching lines @@
         prefs->GetString(prefs::kHomePage),
         prefs->GetBoolean(prefs::kHomePageIsNewTabPage),
         prefs->GetBoolean(prefs::kShowHomeButton),
         // Backup:
         backup_homepage,
         backup_homepage_is_ntp,
         backup_show_home_button));
   }
 }
 
+void StartupBrowserCreatorImpl::LaunchDevToolsHandlerIfNeeded(
+    Profile* profile, const CommandLine& command_line) {

[sky, 2012/12/04 00:10:53]

wrap command_line to new line.

+  if (command_line.HasSwitch(switches::kRemoteDebuggingPort)) {

[sky, 2012/12/04 00:10:53]

Refactor this so you don't duplicate it.

[zel, 2012/12/04 00:38:47]

Yeah, that's what I wanted to ping you about - where would be a good place to
move this to?

[sky, 2012/12/04 01:22:45]

If there is a directory for devtools stuff I would stick it there. Otherwise
maybe a function in the chrome namespace in the file
chrome/browser/launch_devtools.

[zel, 2012/12/04 02:12:28]

Moved to chrome_browser_main.cc... invoked from
ChromeBrowserMainParts::PostProfileInit()

+    std::string port_str =
+        command_line.GetSwitchValueASCII(switches::kRemoteDebuggingPort);
+    int64 port;
+    if (base::StringToInt64(port_str, &port) && port > 0 && port < 65535) {
+      std::string frontend_str;
+      if (command_line.HasSwitch(switches::kRemoteDebuggingFrontend)) {
+        frontend_str = command_line.GetSwitchValueASCII(
+            switches::kRemoteDebuggingFrontend);
+      }
+      g_browser_process->CreateDevToolsHttpProtocolHandler(
+          profile,
+          "127.0.0.1",
+          static_cast<int>(port),
+          frontend_str);
+    } else {
+      DLOG(WARNING) << "Invalid http debugger port number " << port;
+    }
+  }
+}
+
 #if !defined(OS_WIN) || defined(USE_AURA)
 // static
 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
     Profile* profile,
     const std::vector<GURL>& startup_urls) {
   return false;
 }
 #endif