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

Side by Side Diff: ash/drag_drop/drag_image_view.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/drag_drop/drag_drop_tracker_unittest.cc ('k') | ash/extended_desktop_unittest.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 (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_DRAG_DROP_DRAG_IMAGE_VIEW_H_ 5 #ifndef ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
6 #define ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_ 6 #define ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
7 7
8 #include "ui/base/dragdrop/drag_drop_types.h" 8 #include "ui/base/dragdrop/drag_drop_types.h"
9 #include "ui/views/controls/image_view.h" 9 #include "ui/views/controls/image_view.h"
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // |operation| is a bit field indicating allowable drag operations from 52 // |operation| is a bit field indicating allowable drag operations from
53 // ui::DragDropTypes::DragOperation. 53 // ui::DragDropTypes::DragOperation.
54 void SetTouchDragOperation(int operation); 54 void SetTouchDragOperation(int operation);
55 void SetTouchDragOperationHintPosition(const gfx::Point& position); 55 void SetTouchDragOperationHintPosition(const gfx::Point& position);
56 56
57 // Sets the |opacity| of the image view between 0.0 and 1.0. 57 // Sets the |opacity| of the image view between 0.0 and 1.0.
58 void SetOpacity(float opacity); 58 void SetOpacity(float opacity);
59 59
60 private: 60 private:
61 // Overridden from views::ImageView. 61 // Overridden from views::ImageView.
62 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 62 virtual void OnPaint(gfx::Canvas* canvas) override;
63 63
64 scoped_ptr<views::Widget> widget_; 64 scoped_ptr<views::Widget> widget_;
65 gfx::Size widget_size_; 65 gfx::Size widget_size_;
66 66
67 ui::DragDropTypes::DragEventSource drag_event_source_; 67 ui::DragDropTypes::DragEventSource drag_event_source_;
68 int touch_drag_operation_; 68 int touch_drag_operation_;
69 gfx::Point touch_drag_operation_indicator_position_; 69 gfx::Point touch_drag_operation_indicator_position_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(DragImageView); 71 DISALLOW_COPY_AND_ASSIGN(DragImageView);
72 }; 72 };
73 73
74 } // namespace ash 74 } // namespace ash
75 75
76 #endif // ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_ 76 #endif // ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_tracker_unittest.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698