| 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 "shell/application_manager/application_manager.h" | 5 #include "shell/application_manager/application_manager.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/lazy_instance.h" | |
| 9 #include "base/logging.h" | 8 #include "base/logging.h" |
| 10 #include "base/macros.h" | 9 #include "base/macros.h" |
| 11 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| 12 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
| 13 #include "mojo/public/cpp/bindings/binding.h" | 12 #include "mojo/public/cpp/bindings/binding.h" |
| 14 #include "mojo/public/cpp/bindings/error_handler.h" | 13 #include "mojo/public/cpp/bindings/error_handler.h" |
| 15 #include "mojo/public/interfaces/application/shell.mojom.h" | |
| 16 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.
h" | 14 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.
h" |
| 17 #include "shell/application_manager/fetcher.h" | 15 #include "shell/application_manager/fetcher.h" |
| 18 #include "shell/application_manager/local_fetcher.h" | 16 #include "shell/application_manager/local_fetcher.h" |
| 19 #include "shell/application_manager/network_fetcher.h" | 17 #include "shell/application_manager/network_fetcher.h" |
| 18 #include "shell/application_manager/shell_impl.h" |
| 20 | 19 |
| 21 namespace mojo { | 20 namespace mojo { |
| 22 namespace shell { | 21 namespace shell { |
| 23 | 22 |
| 24 namespace { | 23 namespace { |
| 25 | 24 |
| 26 // Used by TestAPI. | 25 // Used by TestAPI. |
| 27 bool has_created_instance = false; | 26 bool has_created_instance = false; |
| 28 | 27 |
| 29 GURL StripQueryFromURL(const GURL& url) { | 28 GURL StripQueryFromURL(const GURL& url) { |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 return Array<String>(); | 460 return Array<String>(); |
| 462 } | 461 } |
| 463 | 462 |
| 464 void ApplicationManager::CleanupRunner(NativeRunner* runner) { | 463 void ApplicationManager::CleanupRunner(NativeRunner* runner) { |
| 465 native_runners_.erase( | 464 native_runners_.erase( |
| 466 std::find(native_runners_.begin(), native_runners_.end(), runner)); | 465 std::find(native_runners_.begin(), native_runners_.end(), runner)); |
| 467 } | 466 } |
| 468 | 467 |
| 469 } // namespace shell | 468 } // namespace shell |
| 470 } // namespace mojo | 469 } // namespace mojo |
| OLD | NEW |