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

Side by Side Diff: mash/task_viewer/task_viewer_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/task_viewer/main.cc ('k') | mash/task_viewer/task_viewer_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_TASK_VIEWER_TASK_VIEWER_APPLICATION_DELEGATE_H_ 5 #ifndef MASH_TASK_VIEWER_TASK_VIEWER_APPLICATION_DELEGATE_H_
6 #define MASH_TASK_VIEWER_TASK_VIEWER_APPLICATION_DELEGATE_H_ 6 #define MASH_TASK_VIEWER_TASK_VIEWER_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"
14 #include "mojo/services/tracing/public/cpp/tracing_impl.h" 13 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
14 #include "mojo/shell/public/cpp/application_delegate.h"
15 15
16 namespace mojo { 16 namespace mojo {
17 class ApplicationConnection; 17 class ApplicationConnection;
18 } 18 }
19 19
20 namespace views { 20 namespace views {
21 class AuraInit; 21 class AuraInit;
22 } 22 }
23 23
24 namespace mash { 24 namespace mash {
(...skipping 11 matching lines...) Expand all
36 mojo::TracingImpl tracing_; 36 mojo::TracingImpl tracing_;
37 scoped_ptr<views::AuraInit> aura_init_; 37 scoped_ptr<views::AuraInit> aura_init_;
38 38
39 DISALLOW_COPY_AND_ASSIGN(TaskViewerApplicationDelegate); 39 DISALLOW_COPY_AND_ASSIGN(TaskViewerApplicationDelegate);
40 }; 40 };
41 41
42 } // namespace task_viewer 42 } // namespace task_viewer
43 } // namespace mash 43 } // namespace mash
44 44
45 #endif // MASH_TASK_VIEWER_TASK_VIEWER_APPLICATION_DELEGATE_H_ 45 #endif // MASH_TASK_VIEWER_TASK_VIEWER_APPLICATION_DELEGATE_H_
OLDNEW
« no previous file with comments | « mash/task_viewer/main.cc ('k') | mash/task_viewer/task_viewer_application_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698