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

Side by Side Diff: shell/application_manager/application_manager.cc

Issue 961053005: More shell cleanup: Move NativeRunner(Factory) to native_runner.h. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 9 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
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 "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"
20 #include "shell/application_manager/query_util.h" 18 #include "shell/application_manager/query_util.h"
19 #include "shell/application_manager/shell_impl.h"
21 20
22 namespace mojo { 21 namespace mojo {
23 namespace shell { 22 namespace shell {
24 23
25 namespace { 24 namespace {
26 25
27 // Used by TestAPI. 26 // Used by TestAPI.
28 bool has_created_instance = false; 27 bool has_created_instance = false;
29 28
30 } // namespace 29 } // namespace
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 return Array<String>(); 451 return Array<String>();
453 } 452 }
454 453
455 void ApplicationManager::CleanupRunner(NativeRunner* runner) { 454 void ApplicationManager::CleanupRunner(NativeRunner* runner) {
456 native_runners_.erase( 455 native_runners_.erase(
457 std::find(native_runners_.begin(), native_runners_.end(), runner)); 456 std::find(native_runners_.begin(), native_runners_.end(), runner));
458 } 457 }
459 458
460 } // namespace shell 459 } // namespace shell
461 } // namespace mojo 460 } // namespace mojo
OLDNEW
« no previous file with comments | « shell/application_manager/application_manager.h ('k') | shell/application_manager/native_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698