| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_ | 5 #ifndef ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_ |
| 6 #define ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_ | 6 #define ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 8 #include <string> | 9 #include <string> |
| 9 | 10 |
| 10 #include "base/macros.h" | 11 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 13 | 13 |
| 14 namespace aura { | 14 namespace aura { |
| 15 class WindowTreeHost; | 15 class WindowTreeHost; |
| 16 } | 16 } |
| 17 | 17 |
| 18 namespace ui { | 18 namespace ui { |
| 19 class Layer; | 19 class Layer; |
| 20 class LayerDelegate; | 20 class LayerDelegate; |
| 21 } | 21 } |
| (...skipping 10 matching lines...) Expand all Loading... |
| 32 explicit BootSplashScreen(aura::WindowTreeHost* host); | 32 explicit BootSplashScreen(aura::WindowTreeHost* host); |
| 33 ~BootSplashScreen(); | 33 ~BootSplashScreen(); |
| 34 | 34 |
| 35 // Begins animating |layer_|'s opacity to 0 over |duration|. | 35 // Begins animating |layer_|'s opacity to 0 over |duration|. |
| 36 void StartHideAnimation(base::TimeDelta duration); | 36 void StartHideAnimation(base::TimeDelta duration); |
| 37 | 37 |
| 38 private: | 38 private: |
| 39 class CopyHostContentLayerDelegate; | 39 class CopyHostContentLayerDelegate; |
| 40 | 40 |
| 41 // Copies the host window's content to |layer_|. | 41 // Copies the host window's content to |layer_|. |
| 42 scoped_ptr<CopyHostContentLayerDelegate> layer_delegate_; | 42 std::unique_ptr<CopyHostContentLayerDelegate> layer_delegate_; |
| 43 | 43 |
| 44 scoped_ptr<ui::Layer> layer_; | 44 std::unique_ptr<ui::Layer> layer_; |
| 45 | 45 |
| 46 DISALLOW_COPY_AND_ASSIGN(BootSplashScreen); | 46 DISALLOW_COPY_AND_ASSIGN(BootSplashScreen); |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 } // namespace ash | 49 } // namespace ash |
| 50 | 50 |
| 51 #endif // ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_ | 51 #endif // ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_ |
| OLD | NEW |