| 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 UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 5 #ifndef UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| 6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 10 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 9 #include "components/mus/public/cpp/window_tree_delegate.h" | 12 #include "components/mus/public/cpp/window_tree_delegate.h" |
| 10 #include "components/mus/public/interfaces/window_manager.mojom.h" | 13 #include "components/mus/public/interfaces/window_manager.mojom.h" |
| 11 #include "ui/views/mus/mus_export.h" | 14 #include "ui/views/mus/mus_export.h" |
| 12 #include "ui/views/widget/widget.h" | 15 #include "ui/views/widget/widget.h" |
| 13 | 16 |
| 14 namespace mojo { | 17 namespace mojo { |
| 15 class ApplicationImpl; | 18 class ApplicationImpl; |
| 16 } | 19 } |
| 17 | 20 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 mojo::ApplicationImpl* app_; | 61 mojo::ApplicationImpl* app_; |
| 59 mus::mojom::WindowManagerPtr window_manager_; | 62 mus::mojom::WindowManagerPtr window_manager_; |
| 60 scoped_ptr<ui::mojo::UIInit> ui_init_; | 63 scoped_ptr<ui::mojo::UIInit> ui_init_; |
| 61 | 64 |
| 62 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 65 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
| 63 }; | 66 }; |
| 64 | 67 |
| 65 } // namespace views | 68 } // namespace views |
| 66 | 69 |
| 67 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 70 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| OLD | NEW |