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

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

Issue 187073002: Refactoring display configuration state to allow generic state objects (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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"
(...skipping 25 matching lines...) Expand all
36 // Starts the fade-out animation for the all root windows. It will 36 // Starts the fade-out animation for the all root windows. It will
37 // call |callback| once all of the animations have finished. 37 // call |callback| once all of the animations have finished.
38 void StartFadeOutAnimation(base::Closure callback); 38 void StartFadeOutAnimation(base::Closure callback);
39 39
40 // Starts the animation to clear the fade-out animation effect 40 // Starts the animation to clear the fade-out animation effect
41 // for the all root windows. 41 // for the all root windows.
42 void StartFadeInAnimation(); 42 void StartFadeInAnimation();
43 43
44 protected: 44 protected:
45 // chromeos::OutputConfigurator::Observer overrides: 45 // chromeos::OutputConfigurator::Observer overrides:
46 virtual void OnDisplayModeChanged( 46 virtual void OnDisplayModeChanged(const std::vector<
47 const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs) 47 chromeos::OutputConfigurator::InternalDisplayState>& outputs) OVERRIDE;
48 OVERRIDE;
49 virtual void OnDisplayModeChangeFailed(ui::OutputState failed_new_state) 48 virtual void OnDisplayModeChangeFailed(ui::OutputState failed_new_state)
50 OVERRIDE; 49 OVERRIDE;
51 50
52 private: 51 private:
53 // Clears all hiding layers. Note that in case that this method is called 52 // Clears all hiding layers. Note that in case that this method is called
54 // during an animation, the method call will cancel all of the animations 53 // during an animation, the method call will cancel all of the animations
55 // and *not* call the registered callback. 54 // and *not* call the registered callback.
56 void ClearHidingLayers(); 55 void ClearHidingLayers();
57 56
58 std::map<aura::Window*, ui::Layer*> hiding_layers_; 57 std::map<aura::Window*, ui::Layer*> hiding_layers_;
59 scoped_ptr<base::OneShotTimer<OutputConfiguratorAnimation> > timer_; 58 scoped_ptr<base::OneShotTimer<OutputConfiguratorAnimation> > timer_;
60 59
61 DISALLOW_COPY_AND_ASSIGN(OutputConfiguratorAnimation); 60 DISALLOW_COPY_AND_ASSIGN(OutputConfiguratorAnimation);
62 }; 61 };
63 62
64 } // namespace internal 63 } // namespace internal
65 } // namespace ash 64 } // namespace ash
66 65
67 #endif // ASH_DISPLAY_OUTPUT_CONFIGURATION_CONTROLLER_H_ 66 #endif // ASH_DISPLAY_OUTPUT_CONFIGURATION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698