diff options
author | yzshen <yzshen@chromium.org> | 2016-02-09 16:19:54 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 00:20:59 +0000 |
commit | 9d742a75acb0eb31c28c21df4e9570ce04de48ab (patch) | |
tree | 6096fba35fb327f68bc6c22b5335e4b16e4ebe0f /mojo/shell/standalone | |
parent | 3756dcea2132ee864484660e521ed8149ff31763 (diff) | |
download | chromium_src-9d742a75acb0eb31c28c21df4e9570ce04de48ab.zip chromium_src-9d742a75acb0eb31c28c21df4e9570ce04de48ab.tar.gz chromium_src-9d742a75acb0eb31c28c21df4e9570ce04de48ab.tar.bz2 |
Remove DevTools service for Mandoline.
BUG=585289
TEST=None
Review URL: https://codereview.chromium.org/1685883002
Cr-Commit-Position: refs/heads/master@{#374543}
Diffstat (limited to 'mojo/shell/standalone')
-rw-r--r-- | mojo/shell/standalone/BUILD.gn | 3 | ||||
-rw-r--r-- | mojo/shell/standalone/DEPS | 1 | ||||
-rw-r--r-- | mojo/shell/standalone/context.cc | 35 |
3 files changed, 0 insertions, 39 deletions
diff --git a/mojo/shell/standalone/BUILD.gn b/mojo/shell/standalone/BUILD.gn index 6dcfdf3..b84fb32 100644 --- a/mojo/shell/standalone/BUILD.gn +++ b/mojo/shell/standalone/BUILD.gn @@ -105,8 +105,6 @@ source_set("lib") { "//base", "//base:base_static", "//base/third_party/dynamic_annotations", - "//components/devtools_service/public/cpp", - "//components/devtools_service/public/interfaces", "//components/tracing:startup_tracing", "//mojo/message_pump", "//mojo/services/network/public/interfaces", @@ -132,7 +130,6 @@ source_set("lib") { if (!is_component_build) { data_deps = [ - "//components/devtools_service", "//mojo/services/tracing", ] } diff --git a/mojo/shell/standalone/DEPS b/mojo/shell/standalone/DEPS index 09e0750..473cdf7 100644 --- a/mojo/shell/standalone/DEPS +++ b/mojo/shell/standalone/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+components/devtools_service/public", "+components/mus", "+components/mus/gles2", "+components/mus/native_viewport", diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc index ed2c364..6f0ae06 100644 --- a/mojo/shell/standalone/context.cc +++ b/mojo/shell/standalone/context.cc @@ -24,8 +24,6 @@ #include "base/strings/string_util.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" -#include "components/devtools_service/public/cpp/switches.h" -#include "components/devtools_service/public/interfaces/devtools_service.mojom.h" #include "components/tracing/tracing_switches.h" #include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/services/tracing/public/cpp/switches.h" @@ -117,37 +115,6 @@ void InitContentHandlers(PackageManagerImpl* manager, } } -void InitDevToolsServiceIfNeeded(ApplicationManager* manager, - const base::CommandLine& command_line) { - if (!command_line.HasSwitch(devtools_service::kRemoteDebuggingPort)) - return; - - std::string port_str = - command_line.GetSwitchValueASCII(devtools_service::kRemoteDebuggingPort); - unsigned port; - if (!base::StringToUint(port_str, &port) || port > 65535) { - LOG(ERROR) << "Invalid value for switch " - << devtools_service::kRemoteDebuggingPort << ": '" << port_str - << "' is not a valid port number."; - return; - } - - ServiceProviderPtr devtools_service_provider; - scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams); - params->set_source(Identity(GURL("mojo:shell"), std::string(), - GetPermissiveCapabilityFilter())); - params->SetTarget(Identity(GURL("mojo:devtools_service"), std::string(), - GetPermissiveCapabilityFilter())); - params->set_services(GetProxy(&devtools_service_provider)); - manager->ConnectToApplication(std::move(params)); - - devtools_service::DevToolsCoordinatorPtr devtools_coordinator; - devtools_service_provider->ConnectToService( - devtools_service::DevToolsCoordinator::Name_, - GetProxy(&devtools_coordinator).PassMessagePipe()); - devtools_coordinator->Initialize(static_cast<uint16_t>(port)); -} - class TracingServiceProvider : public ServiceProvider { public: TracingServiceProvider(Tracer* tracer, @@ -265,8 +232,6 @@ void Context::Init(const base::FilePath& shell_file_root) { #endif collector->SetShellMainEntryPointTime(main_entry_time_.ToInternalValue()); } - - InitDevToolsServiceIfNeeded(application_manager_.get(), command_line); } void Context::Shutdown() { |