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

Side by Side Diff: mash/shell/shell_application_delegate.h

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . Created 4 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 | « mash/shell/main.cc ('k') | mash/shell/shell_application_delegate.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_ 5 #ifndef MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_
6 #define MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_ 6 #define MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
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 "mojo/application/public/cpp/application_delegate.h" 13 #include "mojo/shell/public/cpp/application_delegate.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 class ApplicationConnection; 16 class ApplicationConnection;
17 } 17 }
18 18
19 namespace mash { 19 namespace mash {
20 namespace shell { 20 namespace shell {
21 21
22 class ShellApplicationDelegate : public mojo::ApplicationDelegate { 22 class ShellApplicationDelegate : public mojo::ApplicationDelegate {
23 public: 23 public:
(...skipping 20 matching lines...) Expand all
44 mojo::ApplicationImpl* app_; 44 mojo::ApplicationImpl* app_;
45 std::map<std::string, scoped_ptr<mojo::ApplicationConnection>> connections_; 45 std::map<std::string, scoped_ptr<mojo::ApplicationConnection>> connections_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate); 47 DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate);
48 }; 48 };
49 49
50 } // namespace shell 50 } // namespace shell
51 } // namespace mash 51 } // namespace mash
52 52
53 #endif // MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_ 53 #endif // MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_
OLDNEW
« no previous file with comments | « mash/shell/main.cc ('k') | mash/shell/shell_application_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698