OLD | NEW |
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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "base/strings/string_split.h" | 8 #include "base/strings/string_split.h" |
9 #include "base/synchronization/waitable_event.h" | 9 #include "base/synchronization/waitable_event.h" |
10 #include "base/threading/platform_thread.h" | 10 #include "base/threading/platform_thread.h" |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 // TODO(qsr): This has no effect for now, as the tracing infrastructure | 179 // TODO(qsr): This has no effect for now, as the tracing infrastructure |
180 // doesn't allow to trace anything before the tracing app connects to the | 180 // doesn't allow to trace anything before the tracing app connects to the |
181 // application. | 181 // application. |
182 TRACE_EVENT0("dart_content_handler", "DartContentHandler::Initialize"); | 182 TRACE_EVENT0("dart_content_handler", "DartContentHandler::Initialize"); |
183 | 183 |
184 default_strict_ = app->HasArg(kEnableStrictMode); | 184 default_strict_ = app->HasArg(kEnableStrictMode); |
185 content_handler_.set_handler_task_runner( | 185 content_handler_.set_handler_task_runner( |
186 base::MessageLoop::current()->task_runner()); | 186 base::MessageLoop::current()->task_runner()); |
187 strict_content_handler_.set_handler_task_runner( | 187 strict_content_handler_.set_handler_task_runner( |
188 base::MessageLoop::current()->task_runner()); | 188 base::MessageLoop::current()->task_runner()); |
189 app->ConnectToService("mojo:url_response_disk_cache", | 189 app->ConnectToServiceDeprecated("mojo:url_response_disk_cache", |
190 &url_response_disk_cache_); | 190 &url_response_disk_cache_); |
191 service_connector_ = new ContentHandlerAppServiceConnector(app); | 191 service_connector_ = new ContentHandlerAppServiceConnector(app); |
192 | 192 |
193 if (app->HasArg(kRunOnMessageLoop)) { | 193 if (app->HasArg(kRunOnMessageLoop)) { |
194 run_on_message_loop_ = true; | 194 run_on_message_loop_ = true; |
195 } | 195 } |
196 | 196 |
197 bool enable_observatory = true; | 197 bool enable_observatory = true; |
198 if (app->HasArg(kDisableObservatory)) { | 198 if (app->HasArg(kDisableObservatory)) { |
199 enable_observatory = false; | 199 enable_observatory = false; |
200 } | 200 } |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
321 pause_isolates_on_exit)); | 321 pause_isolates_on_exit)); |
322 } | 322 } |
323 } | 323 } |
324 | 324 |
325 } // namespace dart | 325 } // namespace dart |
326 | 326 |
327 MojoResult MojoMain(MojoHandle application_request) { | 327 MojoResult MojoMain(MojoHandle application_request) { |
328 mojo::ApplicationRunnerChromium runner(new dart::DartContentHandlerApp); | 328 mojo::ApplicationRunnerChromium runner(new dart::DartContentHandlerApp); |
329 return runner.Run(application_request); | 329 return runner.Run(application_request); |
330 } | 330 } |
OLD | NEW |