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

Side by Side Diff: mojo/services/catalog/factory.h

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
Patch Set: . Created 4 years, 8 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
« no previous file with comments | « mojo/services/catalog/entry_unittest.cc ('k') | mojo/services/catalog/factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 MOJO_SERVICES_CATALOG_FACTORY_H_ 5 #ifndef MOJO_SERVICES_CATALOG_FACTORY_H_
6 #define MOJO_SERVICES_CATALOG_FACTORY_H_ 6 #define MOJO_SERVICES_CATALOG_FACTORY_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "mojo/public/cpp/bindings/binding.h" 14 #include "mojo/public/cpp/bindings/binding.h"
15 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h" 15 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
16 #include "mojo/services/catalog/public/interfaces/resolver.mojom.h" 16 #include "mojo/services/catalog/public/interfaces/resolver.mojom.h"
17 #include "mojo/services/catalog/types.h" 17 #include "mojo/services/catalog/types.h"
18 #include "mojo/shell/public/cpp/shell_client.h" 18 #include "services/shell/public/cpp/shell_client.h"
19 #include "mojo/shell/public/interfaces/shell_client.mojom.h" 19 #include "services/shell/public/interfaces/shell_client.mojom.h"
20 #include "mojo/shell/public/interfaces/shell_resolver.mojom.h" 20 #include "services/shell/public/interfaces/shell_resolver.mojom.h"
21 21
22 namespace base { 22 namespace base {
23 class TaskRunner; 23 class TaskRunner;
24 } 24 }
25 25
26 namespace mojo{ 26 namespace mojo{
27 class ShellConnection; 27 class ShellConnection;
28 } 28 }
29 29
30 namespace catalog { 30 namespace catalog {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 EntryCache system_catalog_; 79 EntryCache system_catalog_;
80 80
81 base::WeakPtrFactory<Factory> weak_factory_; 81 base::WeakPtrFactory<Factory> weak_factory_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(Factory); 83 DISALLOW_COPY_AND_ASSIGN(Factory);
84 }; 84 };
85 85
86 } // namespace catalog 86 } // namespace catalog
87 87
88 #endif // MOJO_SERVICES_CATALOG_FACTORY_H_ 88 #endif // MOJO_SERVICES_CATALOG_FACTORY_H_
OLDNEW
« no previous file with comments | « mojo/services/catalog/entry_unittest.cc ('k') | mojo/services/catalog/factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698