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

Side by Side Diff: ash/display/shared_display_edge_indicator.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
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_SHARED_DISPLAY_EDGE_INDICATOR_H_ 5 #ifndef ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_
6 #define ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_ 6 #define ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_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 19 matching lines...) Expand all
30 SharedDisplayEdgeIndicator(); 30 SharedDisplayEdgeIndicator();
31 virtual ~SharedDisplayEdgeIndicator(); 31 virtual ~SharedDisplayEdgeIndicator();
32 32
33 // Shows/Hides the indicator window. The |src_bounds| is for the window on 33 // Shows/Hides the indicator window. The |src_bounds| is for the window on
34 // the source display, and the |dst_bounds| is for the window on the other 34 // the source display, and the |dst_bounds| is for the window on the other
35 // display. 35 // display.
36 void Show(const gfx::Rect& src_bounds, const gfx::Rect& dst_bounds); 36 void Show(const gfx::Rect& src_bounds, const gfx::Rect& dst_bounds);
37 void Hide(); 37 void Hide();
38 38
39 // gfx::AnimationDelegate overrides: 39 // gfx::AnimationDelegate overrides:
40 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 40 virtual void AnimationProgressed(const gfx::Animation* animation) override;
41 41
42 private: 42 private:
43 // Used to show the displays' shared edge where a window can be moved across. 43 // Used to show the displays' shared edge where a window can be moved across.
44 // |src_widget_| is for the display where drag starts and |dst_widget_| is 44 // |src_widget_| is for the display where drag starts and |dst_widget_| is
45 // for the other display. 45 // for the other display.
46 views::View* src_indicator_; 46 views::View* src_indicator_;
47 views::View* dst_indicator_; 47 views::View* dst_indicator_;
48 48
49 // Used to transition the opacity. 49 // Used to transition the opacity.
50 scoped_ptr<gfx::ThrobAnimation> animation_; 50 scoped_ptr<gfx::ThrobAnimation> animation_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(SharedDisplayEdgeIndicator); 52 DISALLOW_COPY_AND_ASSIGN(SharedDisplayEdgeIndicator);
53 }; 53 };
54 54
55 } // namespace ash 55 } // namespace ash
56 56
57 #endif // ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_ 57 #endif // ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_
OLDNEW
« no previous file with comments | « ash/display/screen_position_controller_unittest.cc ('k') | ash/display/shared_display_edge_indicator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698