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

Side by Side Diff: mojo/public/cpp/shell/application.h

Issue 218613010: Mojo: Move mojo/public/bindings/*.h to mojo/public/cpp/bindings/*.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « mojo/public/cpp/shell/DEPS ('k') | mojo/public/cpp/shell/service.h » ('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 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 #ifndef MOJO_PUBLIC_SHELL_APPLICATION_H_ 5 #ifndef MOJO_PUBLIC_SHELL_APPLICATION_H_
6 #define MOJO_PUBLIC_SHELL_APPLICATION_H_ 6 #define MOJO_PUBLIC_SHELL_APPLICATION_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "mojo/public/bindings/remote_ptr.h" 10 #include "mojo/public/cpp/bindings/remote_ptr.h"
11 #include "mojo/public/cpp/shell/service.h" 11 #include "mojo/public/cpp/shell/service.h"
12 #include "mojo/public/cpp/system/core.h" 12 #include "mojo/public/cpp/system/core.h"
13 #include "mojo/public/interfaces/shell/shell.mojom.h" 13 #include "mojo/public/interfaces/shell/shell.mojom.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 16
17 class Application : public internal::ServiceFactoryBase::Owner { 17 class Application : public internal::ServiceFactoryBase::Owner {
18 public: 18 public:
19 explicit Application(ScopedShellHandle shell_handle); 19 explicit Application(ScopedShellHandle shell_handle);
20 explicit Application(MojoHandle shell_handle); 20 explicit Application(MojoHandle shell_handle);
(...skipping 13 matching lines...) Expand all
34 MOJO_OVERRIDE; 34 MOJO_OVERRIDE;
35 35
36 private: 36 private:
37 typedef std::vector<internal::ServiceFactoryBase*> ServiceFactoryList; 37 typedef std::vector<internal::ServiceFactoryBase*> ServiceFactoryList;
38 ServiceFactoryList service_factories_; 38 ServiceFactoryList service_factories_;
39 }; 39 };
40 40
41 } // namespace mojo 41 } // namespace mojo
42 42
43 #endif // MOJO_PUBLIC_SHELL_APPLICATION_H_ 43 #endif // MOJO_PUBLIC_SHELL_APPLICATION_H_
OLDNEW
« no previous file with comments | « mojo/public/cpp/shell/DEPS ('k') | mojo/public/cpp/shell/service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698