Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: services/debugger/debugger.cc

Issue 1916233002: Mark ApplicationImpl::ConnectTo{Application,Service}() as deprecated. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « services/dart/dart_tracing.cc ('k') | services/files/files_test_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <algorithm> 5 #include <algorithm>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/profiler.h" 8 #include "base/debug/profiler.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 29 matching lines...) Expand all
40 app_ = app; 40 app_ = app;
41 41
42 // Format: --args-for="app_url command_port" 42 // Format: --args-for="app_url command_port"
43 if (app->args().size() < 2) { 43 if (app->args().size() < 2) {
44 LOG(ERROR) << "--args-for required to specify command_port"; 44 LOG(ERROR) << "--args-for required to specify command_port";
45 mojo::ApplicationImpl::Terminate(); 45 mojo::ApplicationImpl::Terminate();
46 return; 46 return;
47 } 47 }
48 base::StringToUint(app->args()[1], &command_port_); 48 base::StringToUint(app->args()[1], &command_port_);
49 http_server::HttpServerFactoryPtr http_server_factory; 49 http_server::HttpServerFactoryPtr http_server_factory;
50 app->ConnectToService("mojo:http_server", &http_server_factory); 50 app->ConnectToServiceDeprecated("mojo:http_server", &http_server_factory);
51 51
52 mojo::NetAddressPtr local_address(mojo::NetAddress::New()); 52 mojo::NetAddressPtr local_address(mojo::NetAddress::New());
53 local_address->family = mojo::NetAddressFamily::IPV4; 53 local_address->family = mojo::NetAddressFamily::IPV4;
54 local_address->ipv4 = mojo::NetAddressIPv4::New(); 54 local_address->ipv4 = mojo::NetAddressIPv4::New();
55 local_address->ipv4->addr.resize(4); 55 local_address->ipv4->addr.resize(4);
56 local_address->ipv4->addr[0] = 127; 56 local_address->ipv4->addr[0] = 127;
57 local_address->ipv4->addr[1] = 0; 57 local_address->ipv4->addr[1] = 0;
58 local_address->ipv4->addr[2] = 0; 58 local_address->ipv4->addr[2] = 0;
59 local_address->ipv4->addr[3] = 1; 59 local_address->ipv4->addr[3] = 1;
60 local_address->ipv4->port = command_port_; 60 local_address->ipv4->port = command_port_;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 exit(0); 114 exit(0);
115 } 115 }
116 116
117 void StartTracing(const HandleRequestCallback& callback) { 117 void StartTracing(const HandleRequestCallback& callback) {
118 if (is_tracing_) { 118 if (is_tracing_) {
119 Error(callback, "Already tracing. Use stop_tracing to stop.\n"); 119 Error(callback, "Already tracing. Use stop_tracing to stop.\n");
120 return; 120 return;
121 } 121 }
122 122
123 if (!tracing_) 123 if (!tracing_)
124 app_->ConnectToService("mojo:tracing", &tracing_); 124 app_->ConnectToServiceDeprecated("mojo:tracing", &tracing_);
125 is_tracing_ = true; 125 is_tracing_ = true;
126 mojo::DataPipe pipe; 126 mojo::DataPipe pipe;
127 tracing_->Start(pipe.producer_handle.Pass(), mojo::String("*")); 127 tracing_->Start(pipe.producer_handle.Pass(), mojo::String("*"));
128 trace_collector_.reset(new TraceCollector(pipe.consumer_handle.Pass())); 128 trace_collector_.reset(new TraceCollector(pipe.consumer_handle.Pass()));
129 Respond(callback, "Starting trace (type 'stop_tracing' to stop)\n"); 129 Respond(callback, "Starting trace (type 'stop_tracing' to stop)\n");
130 } 130 }
131 131
132 void StopTracing(const HandleRequestCallback& callback) { 132 void StopTracing(const HandleRequestCallback& callback) {
133 if (!is_tracing_) { 133 if (!is_tracing_) {
134 Error(callback, "Not tracing yet. Use start_tracing to start.\n"); 134 Error(callback, "Not tracing yet. Use start_tracing to start.\n");
(...skipping 24 matching lines...) Expand all
159 DISALLOW_COPY_AND_ASSIGN(Debugger); 159 DISALLOW_COPY_AND_ASSIGN(Debugger);
160 }; 160 };
161 161
162 } // namespace debugger 162 } // namespace debugger
163 163
164 MojoResult MojoMain(MojoHandle application_request) { 164 MojoResult MojoMain(MojoHandle application_request) {
165 mojo::ApplicationRunnerChromium runner(new debugger::Debugger); 165 mojo::ApplicationRunnerChromium runner(new debugger::Debugger);
166 runner.set_message_loop_type(base::MessageLoop::TYPE_IO); 166 runner.set_message_loop_type(base::MessageLoop::TYPE_IO);
167 return runner.Run(application_request); 167 return runner.Run(application_request);
168 } 168 }
OLDNEW
« no previous file with comments | « services/dart/dart_tracing.cc ('k') | services/files/files_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698