| 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 "mojo/shell/application_manager.h" | 5 #include "mojo/shell/application_manager.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "base/trace_event/trace_event.h" | 13 #include "base/trace_event/trace_event.h" |
| 14 #include "mojo/public/cpp/bindings/binding.h" |
| 14 #include "mojo/shell/application_instance.h" | 15 #include "mojo/shell/application_instance.h" |
| 15 #include "mojo/shell/fetcher.h" | 16 #include "mojo/shell/fetcher.h" |
| 16 #include "mojo/shell/package_manager.h" | 17 #include "mojo/shell/package_manager.h" |
| 17 #include "mojo/shell/query_util.h" | 18 #include "mojo/shell/query_util.h" |
| 18 #include "mojo/shell/switches.h" | 19 #include "mojo/shell/switches.h" |
| 19 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" | |
| 20 | 20 |
| 21 namespace mojo { | 21 namespace mojo { |
| 22 namespace shell { | 22 namespace shell { |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 // Used by TestAPI. | 26 // Used by TestAPI. |
| 27 bool has_created_instance = false; | 27 bool has_created_instance = false; |
| 28 | 28 |
| 29 void OnEmptyOnConnectCallback(uint32_t content_handler_id) {} | 29 void OnEmptyOnConnectCallback(uint32_t content_handler_id) {} |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 native_runners_.erase( | 260 native_runners_.erase( |
| 261 std::find(native_runners_.begin(), native_runners_.end(), runner)); | 261 std::find(native_runners_.begin(), native_runners_.end(), runner)); |
| 262 } | 262 } |
| 263 | 263 |
| 264 Shell::ConnectToApplicationCallback EmptyConnectCallback() { | 264 Shell::ConnectToApplicationCallback EmptyConnectCallback() { |
| 265 return base::Bind(&OnEmptyOnConnectCallback); | 265 return base::Bind(&OnEmptyOnConnectCallback); |
| 266 } | 266 } |
| 267 | 267 |
| 268 } // namespace shell | 268 } // namespace shell |
| 269 } // namespace mojo | 269 } // namespace mojo |
| OLD | NEW |