| 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 BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_ | 5 #ifndef BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_ |
| 6 #define BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_ | 6 #define BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "ui/platform_window/platform_window_delegate.h" | 10 #include "ui/platform_window/platform_window_delegate.h" |
| 11 | 11 |
| 12 namespace gfx { | 12 namespace gfx { |
| 13 class Size; | 13 class Size; |
| 14 } | 14 } |
| 15 | 15 |
| 16 namespace ui { | 16 namespace ui { |
| 17 class PlatformWindow; | 17 class PlatformWindow; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace blimp { | 20 namespace blimp { |
| 21 namespace client { |
| 21 | 22 |
| 22 class BlimpCompositor; | 23 class BlimpCompositor; |
| 23 class RenderWidgetFeature; | 24 class RenderWidgetFeature; |
| 24 class TabControlFeature; | 25 class TabControlFeature; |
| 25 | 26 |
| 26 class BlimpDisplayManagerDelegate { | 27 class BlimpDisplayManagerDelegate { |
| 27 public: | 28 public: |
| 28 virtual void OnClosed() = 0; | 29 virtual void OnClosed() = 0; |
| 29 }; | 30 }; |
| 30 | 31 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 54 | 55 |
| 55 BlimpDisplayManagerDelegate* delegate_; | 56 BlimpDisplayManagerDelegate* delegate_; |
| 56 TabControlFeature* tab_control_feature_; | 57 TabControlFeature* tab_control_feature_; |
| 57 | 58 |
| 58 scoped_ptr<BlimpCompositor> blimp_compositor_; | 59 scoped_ptr<BlimpCompositor> blimp_compositor_; |
| 59 scoped_ptr<ui::PlatformWindow> platform_window_; | 60 scoped_ptr<ui::PlatformWindow> platform_window_; |
| 60 | 61 |
| 61 DISALLOW_COPY_AND_ASSIGN(BlimpDisplayManager); | 62 DISALLOW_COPY_AND_ASSIGN(BlimpDisplayManager); |
| 62 }; | 63 }; |
| 63 | 64 |
| 65 } // namespace client |
| 64 } // namespace blimp | 66 } // namespace blimp |
| 65 | 67 |
| 66 #endif // BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_ | 68 #endif // BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_ |
| OLD | NEW |