OLD | NEW |
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 COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ | 5 #ifndef MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ |
6 #define COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ | 6 #define MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ |
7 | 7 |
| 8 #include "base/macros.h" |
8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
9 #include "components/mus/public/cpp/window_tree_delegate.h" | 10 #include "components/mus/public/cpp/window_tree_delegate.h" |
10 #include "components/mus/public/interfaces/window_manager.mojom.h" | 11 #include "components/mus/public/interfaces/window_manager.mojom.h" |
11 #include "ui/views/mus/aura_init.h" | 12 #include "ui/views/mus/aura_init.h" |
12 #include "ui/views/views_delegate.h" | 13 #include "ui/views/views_delegate.h" |
13 | 14 |
14 namespace mojo { | 15 namespace mojo { |
15 class ApplicationImpl; | 16 class ApplicationImpl; |
16 } | 17 } |
17 | 18 |
(...skipping 25 matching lines...) Expand all Loading... |
43 HICON GetSmallWindowIcon() const override; | 44 HICON GetSmallWindowIcon() const override; |
44 #endif | 45 #endif |
45 | 46 |
46 mojo::ApplicationImpl* app_; | 47 mojo::ApplicationImpl* app_; |
47 scoped_ptr<views::AuraInit> aura_init_; | 48 scoped_ptr<views::AuraInit> aura_init_; |
48 mus::mojom::WindowManagerPtr window_manager_; | 49 mus::mojom::WindowManagerPtr window_manager_; |
49 | 50 |
50 DISALLOW_COPY_AND_ASSIGN(MUSViewsInit); | 51 DISALLOW_COPY_AND_ASSIGN(MUSViewsInit); |
51 }; | 52 }; |
52 | 53 |
53 #endif // COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ | 54 #endif // MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ |
OLD | NEW |