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

Side by Side Diff: cc/layer_animation_controller.h

Issue 11145033: cc: Get rid of CC*.h temporary header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased - fixed the conflicts hopefuly Created 8 years, 2 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
« no previous file with comments | « cc/layer.cc ('k') | cc/layer_animation_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 CCLayerAnimationController_h 5 #ifndef CCLayerAnimationController_h
6 #define CCLayerAnimationController_h 6 #define CCLayerAnimationController_h
7 7
8 #include "CCAnimationEvents.h" 8 #include "cc/animation_events.h"
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/hash_tables.h" 11 #include "base/hash_tables.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "cc/scoped_ptr_vector.h" 13 #include "cc/scoped_ptr_vector.h"
14 14
15 namespace WebKit { 15 namespace WebKit {
16 class WebTransformationMatrix; 16 class WebTransformationMatrix;
17 } 17 }
18 18
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 CCLayerAnimationControllerClient* m_client; 104 CCLayerAnimationControllerClient* m_client;
105 ScopedPtrVector<CCActiveAnimation> m_activeAnimations; 105 ScopedPtrVector<CCActiveAnimation> m_activeAnimations;
106 106
107 DISALLOW_COPY_AND_ASSIGN(CCLayerAnimationController); 107 DISALLOW_COPY_AND_ASSIGN(CCLayerAnimationController);
108 }; 108 };
109 109
110 } // namespace cc 110 } // namespace cc
111 111
112 #endif // CCLayerAnimationController_h 112 #endif // CCLayerAnimationController_h
OLDNEW
« no previous file with comments | « cc/layer.cc ('k') | cc/layer_animation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698