| 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/ui/startup/startup_browser_creator_impl.h" | 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 if (command_line_.HasSwitch(switches::kDnsLogDetails)) | 338 if (command_line_.HasSwitch(switches::kDnsLogDetails)) |
| 339 chrome_browser_net::EnablePredictorDetailedLog(true); | 339 chrome_browser_net::EnablePredictorDetailedLog(true); |
| 340 if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) && | 340 if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) && |
| 341 profile->GetNetworkPredictor()) { | 341 profile->GetNetworkPredictor()) { |
| 342 profile->GetNetworkPredictor()->EnablePredictor(false); | 342 profile->GetNetworkPredictor()->EnablePredictor(false); |
| 343 } | 343 } |
| 344 | 344 |
| 345 if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit)) | 345 if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit)) |
| 346 base::StatisticsRecorder::set_dump_on_exit(true); | 346 base::StatisticsRecorder::set_dump_on_exit(true); |
| 347 | 347 |
| 348 if (command_line_.HasSwitch(switches::kRemoteDebuggingPort)) { | |
| 349 std::string port_str = | |
| 350 command_line_.GetSwitchValueASCII(switches::kRemoteDebuggingPort); | |
| 351 int64 port; | |
| 352 if (base::StringToInt64(port_str, &port) && port > 0 && port < 65535) { | |
| 353 std::string frontend_str; | |
| 354 if (command_line_.HasSwitch(switches::kRemoteDebuggingFrontend)) { | |
| 355 frontend_str = command_line_.GetSwitchValueASCII( | |
| 356 switches::kRemoteDebuggingFrontend); | |
| 357 } | |
| 358 g_browser_process->CreateDevToolsHttpProtocolHandler( | |
| 359 profile, | |
| 360 "127.0.0.1", | |
| 361 static_cast<int>(port), | |
| 362 frontend_str); | |
| 363 } else { | |
| 364 DLOG(WARNING) << "Invalid http debugger port number " << port; | |
| 365 } | |
| 366 } | |
| 367 | |
| 368 #if defined(ENABLE_APP_LIST) | 348 #if defined(ENABLE_APP_LIST) |
| 369 app_list_controller::CheckAppListTaskbarShortcut(); | 349 app_list_controller::CheckAppListTaskbarShortcut(); |
| 370 if (command_line_.HasSwitch(switches::kShowAppList)) { | 350 if (command_line_.HasSwitch(switches::kShowAppList)) { |
| 371 app_list_controller::ShowAppList(); | 351 app_list_controller::ShowAppList(); |
| 372 return true; | 352 return true; |
| 373 } | 353 } |
| 374 #endif | 354 #endif |
| 375 | 355 |
| 376 // Open the required browser windows and tabs. First, see if | 356 // Open the required browser windows and tabs. First, see if |
| 377 // we're being run as an application window. If so, the user | 357 // we're being run as an application window. If so, the user |
| (...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1055 | 1035 |
| 1056 #if !defined(OS_WIN) || defined(USE_AURA) | 1036 #if !defined(OS_WIN) || defined(USE_AURA) |
| 1057 // static | 1037 // static |
| 1058 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( | 1038 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
| 1059 Profile* profile, | 1039 Profile* profile, |
| 1060 const std::vector<GURL>& startup_urls) { | 1040 const std::vector<GURL>& startup_urls) { |
| 1061 return false; | 1041 return false; |
| 1062 } | 1042 } |
| 1063 #endif | 1043 #endif |
| 1064 | 1044 |
| OLD | NEW |