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

Side by Side Diff: ash/sticky_keys/sticky_keys_overlay.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/snap_to_pixel_layout_manager.h ('k') | ash/sticky_keys/sticky_keys_overlay.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_ 5 #ifndef ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_
6 #define ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_ 6 #define ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/sticky_keys/sticky_keys_state.h" 9 #include "ash/sticky_keys/sticky_keys_state.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // Returns true if the overlay is currently visible. If the overlay is 50 // Returns true if the overlay is currently visible. If the overlay is
51 // animating, the returned value is the target of the animation. 51 // animating, the returned value is the target of the animation.
52 bool is_visible() { return is_visible_; } 52 bool is_visible() { return is_visible_; }
53 53
54 private: 54 private:
55 // Returns the current bounds of the overlay, which is based on visibility. 55 // Returns the current bounds of the overlay, which is based on visibility.
56 gfx::Rect CalculateOverlayBounds(); 56 gfx::Rect CalculateOverlayBounds();
57 57
58 // gfx::LayerAnimationObserver overrides: 58 // gfx::LayerAnimationObserver overrides:
59 virtual void OnLayerAnimationEnded( 59 virtual void OnLayerAnimationEnded(
60 ui::LayerAnimationSequence* sequence) OVERRIDE; 60 ui::LayerAnimationSequence* sequence) override;
61 virtual void OnLayerAnimationAborted( 61 virtual void OnLayerAnimationAborted(
62 ui::LayerAnimationSequence* sequence) OVERRIDE; 62 ui::LayerAnimationSequence* sequence) override;
63 virtual void OnLayerAnimationScheduled( 63 virtual void OnLayerAnimationScheduled(
64 ui::LayerAnimationSequence* sequence) OVERRIDE; 64 ui::LayerAnimationSequence* sequence) override;
65 65
66 bool is_visible_; 66 bool is_visible_;
67 scoped_ptr<views::Widget> overlay_widget_; 67 scoped_ptr<views::Widget> overlay_widget_;
68 // Ownership of |overlay_view_| is passed to the view heirarchy. 68 // Ownership of |overlay_view_| is passed to the view heirarchy.
69 StickyKeysOverlayView* overlay_view_; 69 StickyKeysOverlayView* overlay_view_;
70 gfx::Size widget_size_; 70 gfx::Size widget_size_;
71 }; 71 };
72 72
73 } // namespace ash 73 } // namespace ash
74 74
75 #endif // ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_ 75 #endif // ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_
OLDNEW
« no previous file with comments | « ash/snap_to_pixel_layout_manager.h ('k') | ash/sticky_keys/sticky_keys_overlay.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698