Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Side by Side Diff: ash/display/output_configurator_animation.h

Issue 64933002: Eliminate Shell::RootWindowList in favor of aura::Window::Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_ 5 #ifndef ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_
6 #define ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_ 6 #define ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
13 #include "chromeos/display/output_configurator.h" 13 #include "chromeos/display/output_configurator.h"
14 14
15 namespace aura { 15 namespace aura {
16 class RootWindow; 16 class RootWindow;
varkha 2014/01/06 21:06:45 Is this still necessary?
17 class Window;
17 } // namespace aura 18 } // namespace aura
18 19
19 namespace ui { 20 namespace ui {
20 class Layer; 21 class Layer;
21 } // namespace ui 22 } // namespace ui
22 23
23 namespace ash { 24 namespace ash {
24 namespace internal { 25 namespace internal {
25 26
26 // OutputConfiguratorAnimation provides the visual effects for 27 // OutputConfiguratorAnimation provides the visual effects for
(...skipping 20 matching lines...) Expand all
47 OVERRIDE; 48 OVERRIDE;
48 virtual void OnDisplayModeChangeFailed( 49 virtual void OnDisplayModeChangeFailed(
49 chromeos::OutputState failed_new_state) OVERRIDE; 50 chromeos::OutputState failed_new_state) OVERRIDE;
50 51
51 private: 52 private:
52 // Clears all hiding layers. Note that in case that this method is called 53 // Clears all hiding layers. Note that in case that this method is called
53 // during an animation, the method call will cancel all of the animations 54 // during an animation, the method call will cancel all of the animations
54 // and *not* call the registered callback. 55 // and *not* call the registered callback.
55 void ClearHidingLayers(); 56 void ClearHidingLayers();
56 57
57 std::map<aura::RootWindow*, ui::Layer*> hiding_layers_; 58 std::map<aura::Window*, ui::Layer*> hiding_layers_;
58 scoped_ptr<base::OneShotTimer<OutputConfiguratorAnimation> > timer_; 59 scoped_ptr<base::OneShotTimer<OutputConfiguratorAnimation> > timer_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(OutputConfiguratorAnimation); 61 DISALLOW_COPY_AND_ASSIGN(OutputConfiguratorAnimation);
61 }; 62 };
62 63
63 } // namespace internal 64 } // namespace internal
64 } // namespace ash 65 } // namespace ash
65 66
66 #endif // ASH_DISPLAY_OUTPUT_CONFIGURATION_CONTROLLER_H_ 67 #endif // ASH_DISPLAY_OUTPUT_CONFIGURATION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/display/mouse_cursor_event_filter_unittest.cc ('k') | ash/display/output_configurator_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698