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

Side by Side Diff: ash/shelf/overflow_bubble_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/shelf/overflow_bubble.h ('k') | ash/shelf/overflow_button.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SHELF_OVERFLOW_BUBBLE_VIEW_H_ 5 #ifndef ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_
6 #define ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_ 6 #define ASH_SHELF_OVERFLOW_BUBBLE_VIEW_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/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 10 matching lines...) Expand all
21 // OverflowBubbleView hosts a ShelfView to display overflown items. 21 // OverflowBubbleView hosts a ShelfView to display overflown items.
22 // Exports to access this class from OverflowBubbleViewTestAPI. 22 // Exports to access this class from OverflowBubbleViewTestAPI.
23 class ASH_EXPORT OverflowBubbleView : public views::BubbleDelegateView { 23 class ASH_EXPORT OverflowBubbleView : public views::BubbleDelegateView {
24 public: 24 public:
25 OverflowBubbleView(); 25 OverflowBubbleView();
26 virtual ~OverflowBubbleView(); 26 virtual ~OverflowBubbleView();
27 27
28 void InitOverflowBubble(views::View* anchor, ShelfView* shelf_view); 28 void InitOverflowBubble(views::View* anchor, ShelfView* shelf_view);
29 29
30 // views::BubbleDelegateView overrides: 30 // views::BubbleDelegateView overrides:
31 virtual gfx::Rect GetBubbleBounds() OVERRIDE; 31 virtual gfx::Rect GetBubbleBounds() override;
32 32
33 private: 33 private:
34 friend class test::OverflowBubbleViewTestAPI; 34 friend class test::OverflowBubbleViewTestAPI;
35 35
36 bool IsHorizontalAlignment() const; 36 bool IsHorizontalAlignment() const;
37 37
38 const gfx::Size GetContentsSize() const; 38 const gfx::Size GetContentsSize() const;
39 39
40 // Gets arrow location based on shelf alignment. 40 // Gets arrow location based on shelf alignment.
41 views::BubbleBorder::Arrow GetBubbleArrow() const; 41 views::BubbleBorder::Arrow GetBubbleArrow() const;
42 42
43 void ScrollByXOffset(int x_offset); 43 void ScrollByXOffset(int x_offset);
44 void ScrollByYOffset(int y_offset); 44 void ScrollByYOffset(int y_offset);
45 45
46 // views::View overrides: 46 // views::View overrides:
47 virtual gfx::Size GetPreferredSize() const OVERRIDE; 47 virtual gfx::Size GetPreferredSize() const override;
48 virtual void Layout() OVERRIDE; 48 virtual void Layout() override;
49 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; 49 virtual void ChildPreferredSizeChanged(views::View* child) override;
50 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; 50 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override;
51 51
52 // ui::EventHandler overrides: 52 // ui::EventHandler overrides:
53 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 53 virtual void OnScrollEvent(ui::ScrollEvent* event) override;
54 54
55 ShelfLayoutManager* GetShelfLayoutManager() const; 55 ShelfLayoutManager* GetShelfLayoutManager() const;
56 56
57 ShelfView* shelf_view_; // Owned by views hierarchy. 57 ShelfView* shelf_view_; // Owned by views hierarchy.
58 gfx::Vector2d scroll_offset_; 58 gfx::Vector2d scroll_offset_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(OverflowBubbleView); 60 DISALLOW_COPY_AND_ASSIGN(OverflowBubbleView);
61 }; 61 };
62 62
63 } // namespace ash 63 } // namespace ash
64 64
65 #endif // ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_ 65 #endif // ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shelf/overflow_bubble.h ('k') | ash/shelf/overflow_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698