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

Side by Side Diff: ui/gfx/compositor/layer_animation_manager.h

Issue 8400059: Revert 107715 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 UI_GFX_COMPOSITOR_LAYER_ANIMATION_MANAGER_H_ 5 #ifndef UI_GFX_COMPOSITOR_LAYER_ANIMATION_MANAGER_H_
6 #define UI_GFX_COMPOSITOR_LAYER_ANIMATION_MANAGER_H_ 6 #define UI_GFX_COMPOSITOR_LAYER_ANIMATION_MANAGER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 10
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 scoped_ptr<ui::Animation> animation_; 120 scoped_ptr<ui::Animation> animation_;
121 121
122 bool got_initial_tick_; 122 bool got_initial_tick_;
123 123
124 DISALLOW_COPY_AND_ASSIGN(LayerAnimationManager); 124 DISALLOW_COPY_AND_ASSIGN(LayerAnimationManager);
125 }; 125 };
126 126
127 } // namespace ui 127 } // namespace ui
128 128
129 #endif // UI_GFX_COMPOSITOR_LAYER_ANIMATION_MANAGER_H_ 129 #endif // UI_GFX_COMPOSITOR_LAYER_ANIMATION_MANAGER_H_
OLDNEW
« no previous file with comments | « ui/gfx/compositor/layer_animation_element_unittest.cc ('k') | ui/gfx/compositor/layer_animation_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698