| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_ |
| 6 #define CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_ | 6 #define CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | |
| 10 #include "ui/aura/window_tree_host.h" | 11 #include "ui/aura/window_tree_host.h" |
| 11 | 12 |
| 12 namespace aura { | 13 namespace aura { |
| 13 namespace client { | 14 namespace client { |
| 14 class DefaultCaptureClient; | 15 class DefaultCaptureClient; |
| 15 class FocusClient; | 16 class FocusClient; |
| 16 class WindowTreeClient; | 17 class WindowTreeClient; |
| 17 } | 18 } |
| 18 } | 19 } |
| 19 | 20 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 31 public: | 32 public: |
| 32 explicit ShellPlatformDataAura(const gfx::Size& initial_size); | 33 explicit ShellPlatformDataAura(const gfx::Size& initial_size); |
| 33 ~ShellPlatformDataAura(); | 34 ~ShellPlatformDataAura(); |
| 34 | 35 |
| 35 void ShowWindow(); | 36 void ShowWindow(); |
| 36 void ResizeWindow(const gfx::Size& size); | 37 void ResizeWindow(const gfx::Size& size); |
| 37 | 38 |
| 38 aura::WindowTreeHost* host() { return host_.get(); } | 39 aura::WindowTreeHost* host() { return host_.get(); } |
| 39 | 40 |
| 40 private: | 41 private: |
| 41 scoped_ptr<aura::WindowTreeHost> host_; | 42 std::unique_ptr<aura::WindowTreeHost> host_; |
| 42 scoped_ptr<aura::client::FocusClient> focus_client_; | 43 std::unique_ptr<aura::client::FocusClient> focus_client_; |
| 43 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 44 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 44 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; | 45 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; |
| 45 | 46 |
| 46 DISALLOW_COPY_AND_ASSIGN(ShellPlatformDataAura); | 47 DISALLOW_COPY_AND_ASSIGN(ShellPlatformDataAura); |
| 47 }; | 48 }; |
| 48 | 49 |
| 49 } // namespace content | 50 } // namespace content |
| 50 | 51 |
| 51 #endif // CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_ | 52 #endif // CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_ |
| OLD | NEW |