| 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 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 534 } | 534 } |
| 535 #endif // !defined(OS_ANDROID) | 535 #endif // !defined(OS_ANDROID) |
| 536 | 536 |
| 537 void LaunchDevToolsHandlerIfNeeded(const base::CommandLine& command_line) { | 537 void LaunchDevToolsHandlerIfNeeded(const base::CommandLine& command_line) { |
| 538 if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) { | 538 if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) { |
| 539 std::string port_str = | 539 std::string port_str = |
| 540 command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort); | 540 command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort); |
| 541 int port; | 541 int port; |
| 542 if (base::StringToInt(port_str, &port) && port >= 0 && port < 65535) { | 542 if (base::StringToInt(port_str, &port) && port >= 0 && port < 65535) { |
| 543 g_browser_process->CreateDevToolsHttpProtocolHandler( | 543 g_browser_process->CreateDevToolsHttpProtocolHandler( |
| 544 chrome::HOST_DESKTOP_TYPE_NATIVE, | 544 ui::HOST_DESKTOP_TYPE_NATIVE, "127.0.0.1", static_cast<uint16>(port)); |
| 545 "127.0.0.1", | |
| 546 static_cast<uint16>(port)); | |
| 547 } else { | 545 } else { |
| 548 DLOG(WARNING) << "Invalid http debugger port number " << port; | 546 DLOG(WARNING) << "Invalid http debugger port number " << port; |
| 549 } | 547 } |
| 550 } | 548 } |
| 551 } | 549 } |
| 552 | 550 |
| 553 base::StackSamplingProfiler::SamplingParams GetStartupSamplingParams() { | 551 base::StackSamplingProfiler::SamplingParams GetStartupSamplingParams() { |
| 554 // Sample at 10Hz for 30 seconds. | 552 // Sample at 10Hz for 30 seconds. |
| 555 base::StackSamplingProfiler::SamplingParams params; | 553 base::StackSamplingProfiler::SamplingParams params; |
| 556 params.initial_delay = base::TimeDelta::FromMilliseconds(0); | 554 params.initial_delay = base::TimeDelta::FromMilliseconds(0); |
| (...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1848 chromeos::CrosSettings::Shutdown(); | 1846 chromeos::CrosSettings::Shutdown(); |
| 1849 #endif // defined(OS_CHROMEOS) | 1847 #endif // defined(OS_CHROMEOS) |
| 1850 #endif // defined(OS_ANDROID) | 1848 #endif // defined(OS_ANDROID) |
| 1851 } | 1849 } |
| 1852 | 1850 |
| 1853 // Public members: | 1851 // Public members: |
| 1854 | 1852 |
| 1855 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1853 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1856 chrome_extra_parts_.push_back(parts); | 1854 chrome_extra_parts_.push_back(parts); |
| 1857 } | 1855 } |
| OLD | NEW |