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

Side by Side Diff: shell/context.h

Issue 814273005: Move application_manager from /mojo to /shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Update include guards. Created 5 years, 11 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 | « shell/application_manager/test.mojom ('k') | shell/context.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 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 SHELL_CONTEXT_H_ 5 #ifndef SHELL_CONTEXT_H_
6 #define SHELL_CONTEXT_H_ 6 #define SHELL_CONTEXT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "mojo/application_manager/application_manager.h" 11 #include "shell/application_manager/application_manager.h"
12 #include "shell/mojo_url_resolver.h" 12 #include "shell/mojo_url_resolver.h"
13 #include "shell/task_runners.h" 13 #include "shell/task_runners.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 16
17 namespace shell { 17 namespace shell {
18 18
19 class DynamicApplicationLoader; 19 class DynamicApplicationLoader;
20 class ExternalApplicationListener; 20 class ExternalApplicationListener;
21 21
(...skipping 28 matching lines...) Expand all
50 ApplicationManager application_manager_; 50 ApplicationManager application_manager_;
51 MojoURLResolver mojo_url_resolver_; 51 MojoURLResolver mojo_url_resolver_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(Context); 53 DISALLOW_COPY_AND_ASSIGN(Context);
54 }; 54 };
55 55
56 } // namespace shell 56 } // namespace shell
57 } // namespace mojo 57 } // namespace mojo
58 58
59 #endif // SHELL_CONTEXT_H_ 59 #endif // SHELL_CONTEXT_H_
OLDNEW
« no previous file with comments | « shell/application_manager/test.mojom ('k') | shell/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698