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

Side by Side Diff: services/service_manager/standalone/context.h

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef SERVICES_SHELL_STANDALONE_CONTEXT_H_ 5 #ifndef SERVICES_SERVICE_MANAGER_STANDALONE_CONTEXT_H_
6 #define SERVICES_SHELL_STANDALONE_CONTEXT_H_ 6 #define SERVICES_SERVICE_MANAGER_STANDALONE_CONTEXT_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "mojo/edk/embedder/process_delegate.h" 15 #include "mojo/edk/embedder/process_delegate.h"
16 #include "services/shell/service_manager.h" 16 #include "services/service_manager/service_manager.h"
17 #include "services/shell/standalone/tracer.h" 17 #include "services/service_manager/standalone/tracer.h"
18 18
19 namespace base { 19 namespace base {
20 class SingleThreadTaskRunner; 20 class SingleThreadTaskRunner;
21 } 21 }
22 22
23 namespace catalog { 23 namespace catalog {
24 class Catalog; 24 class Catalog;
25 class Store; 25 class Store;
26 } 26 }
27 27
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 std::unique_ptr<catalog::Catalog> catalog_; 75 std::unique_ptr<catalog::Catalog> catalog_;
76 std::unique_ptr<ServiceManager> service_manager_; 76 std::unique_ptr<ServiceManager> service_manager_;
77 base::Time main_entry_time_; 77 base::Time main_entry_time_;
78 bool init_edk_ = false; 78 bool init_edk_ = false;
79 79
80 DISALLOW_COPY_AND_ASSIGN(Context); 80 DISALLOW_COPY_AND_ASSIGN(Context);
81 }; 81 };
82 82
83 } // namespace shell 83 } // namespace shell
84 84
85 #endif // SERVICES_SHELL_STANDALONE_CONTEXT_H_ 85 #endif // SERVICES_SERVICE_MANAGER_STANDALONE_CONTEXT_H_
OLDNEW
« no previous file with comments | « services/service_manager/standalone/DEPS ('k') | services/service_manager/standalone/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698