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

Side by Side Diff: ash/rotator/screen_rotation.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/screensaver/screensaver_view.h » ('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 (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_SCREEN_ROTATION_H_ 5 #ifndef ASH_SCREEN_ROTATION_H_
6 #define ASH_SCREEN_ROTATION_H_ 6 #define ASH_SCREEN_ROTATION_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 21 matching lines...) Expand all
32 // take ownership of |layer|. 32 // take ownership of |layer|.
33 ScreenRotation(int degrees, ui::Layer* layer); 33 ScreenRotation(int degrees, ui::Layer* layer);
34 virtual ~ScreenRotation(); 34 virtual ~ScreenRotation();
35 35
36 private: 36 private:
37 // Generates the intermediate transformation matrices used during the 37 // Generates the intermediate transformation matrices used during the
38 // animation. 38 // animation.
39 void InitTransform(ui::Layer* layer); 39 void InitTransform(ui::Layer* layer);
40 40
41 // Implementation of ui::LayerAnimationDelegate 41 // Implementation of ui::LayerAnimationDelegate
42 virtual void OnStart(ui::LayerAnimationDelegate* delegate) OVERRIDE; 42 virtual void OnStart(ui::LayerAnimationDelegate* delegate) override;
43 virtual bool OnProgress(double t, 43 virtual bool OnProgress(double t,
44 ui::LayerAnimationDelegate* delegate) OVERRIDE; 44 ui::LayerAnimationDelegate* delegate) override;
45 virtual void OnGetTarget(TargetValue* target) const OVERRIDE; 45 virtual void OnGetTarget(TargetValue* target) const override;
46 virtual void OnAbort(ui::LayerAnimationDelegate* delegate) OVERRIDE; 46 virtual void OnAbort(ui::LayerAnimationDelegate* delegate) override;
47 47
48 scoped_ptr<ui::InterpolatedTransform> interpolated_transform_; 48 scoped_ptr<ui::InterpolatedTransform> interpolated_transform_;
49 49
50 // The number of degrees to rotate. 50 // The number of degrees to rotate.
51 int degrees_; 51 int degrees_;
52 52
53 // The target origin. 53 // The target origin.
54 gfx::Point new_origin_; 54 gfx::Point new_origin_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(ScreenRotation); 56 DISALLOW_COPY_AND_ASSIGN(ScreenRotation);
57 }; 57 };
58 58
59 } // namespace ash 59 } // namespace ash
60 60
61 #endif // ASH_SCREEN_ROTATION_H_ 61 #endif // ASH_SCREEN_ROTATION_H_
OLDNEW
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/screensaver/screensaver_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698