| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 539 } | 539 } |
| 540 #endif // !defined(OS_ANDROID) | 540 #endif // !defined(OS_ANDROID) |
| 541 | 541 |
| 542 void LaunchDevToolsHandlerIfNeeded(const base::CommandLine& command_line) { | 542 void LaunchDevToolsHandlerIfNeeded(const base::CommandLine& command_line) { |
| 543 if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) { | 543 if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) { |
| 544 std::string port_str = | 544 std::string port_str = |
| 545 command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort); | 545 command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort); |
| 546 int port; | 546 int port; |
| 547 if (base::StringToInt(port_str, &port) && port >= 0 && port < 65535) { | 547 if (base::StringToInt(port_str, &port) && port >= 0 && port < 65535) { |
| 548 g_browser_process->CreateDevToolsHttpProtocolHandler( | 548 g_browser_process->CreateDevToolsHttpProtocolHandler( |
| 549 "127.0.0.1", static_cast<uint16_t>(port)); | 549 "", static_cast<uint16_t>(port)); |
| 550 } else { | 550 } else { |
| 551 DLOG(WARNING) << "Invalid http debugger port number " << port; | 551 DLOG(WARNING) << "Invalid http debugger port number " << port; |
| 552 } | 552 } |
| 553 } | 553 } |
| 554 } | 554 } |
| 555 | 555 |
| 556 class ScopedMainMessageLoopRunEvent { | 556 class ScopedMainMessageLoopRunEvent { |
| 557 public: | 557 public: |
| 558 ScopedMainMessageLoopRunEvent() { | 558 ScopedMainMessageLoopRunEvent() { |
| 559 TRACE_EVENT_ASYNC_BEGIN0( | 559 TRACE_EVENT_ASYNC_BEGIN0( |
| (...skipping 1388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1948 chromeos::CrosSettings::Shutdown(); | 1948 chromeos::CrosSettings::Shutdown(); |
| 1949 #endif // defined(OS_CHROMEOS) | 1949 #endif // defined(OS_CHROMEOS) |
| 1950 #endif // defined(OS_ANDROID) | 1950 #endif // defined(OS_ANDROID) |
| 1951 } | 1951 } |
| 1952 | 1952 |
| 1953 // Public members: | 1953 // Public members: |
| 1954 | 1954 |
| 1955 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1955 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1956 chrome_extra_parts_.push_back(parts); | 1956 chrome_extra_parts_.push_back(parts); |
| 1957 } | 1957 } |
| OLD | NEW |