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

Side by Side Diff: ui/views/controls/menu/menu_scroll_view_container.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_
7 7
8 #include "ui/views/view.h" 8 #include "ui/views/view.h"
9 #include "ui/views/bubble/bubble_border.h" 9 #include "ui/views/bubble/bubble_border.h"
10 #include "ui/views/controls/menu/menu_types.h" 10 #include "ui/views/controls/menu/menu_types.h"
(...skipping 13 matching lines...) Expand all
24 View* scroll_down_button() const { return scroll_down_button_; } 24 View* scroll_down_button() const { return scroll_down_button_; }
25 View* scroll_up_button() const { return scroll_up_button_; } 25 View* scroll_up_button() const { return scroll_up_button_; }
26 26
27 // External function to check if the bubble border is usd. 27 // External function to check if the bubble border is usd.
28 bool HasBubbleBorder(); 28 bool HasBubbleBorder();
29 29
30 // Offsets the Arrow from the default location. 30 // Offsets the Arrow from the default location.
31 void SetBubbleArrowOffset(int offset); 31 void SetBubbleArrowOffset(int offset);
32 32
33 // View overrides. 33 // View overrides.
34 virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; 34 virtual void OnPaintBackground(gfx::Canvas* canvas) override;
35 virtual void Layout() OVERRIDE; 35 virtual void Layout() override;
36 virtual gfx::Size GetPreferredSize() const OVERRIDE; 36 virtual gfx::Size GetPreferredSize() const override;
37 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 37 virtual void GetAccessibleState(ui::AXViewState* state) override;
38 38
39 protected: 39 protected:
40 // View override. 40 // View override.
41 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 41 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
42 42
43 private: 43 private:
44 // Create the default border. 44 // Create the default border.
45 void CreateDefaultBorder(); 45 void CreateDefaultBorder();
46 46
47 // Create the bubble border. 47 // Create the bubble border.
48 void CreateBubbleBorder(); 48 void CreateBubbleBorder();
49 49
50 BubbleBorder::Arrow BubbleBorderTypeFromAnchor(MenuAnchorPosition anchor); 50 BubbleBorder::Arrow BubbleBorderTypeFromAnchor(MenuAnchorPosition anchor);
51 51
(...skipping 14 matching lines...) Expand all
66 66
67 // Weak reference to the currently set border. 67 // Weak reference to the currently set border.
68 BubbleBorder* bubble_border_; 68 BubbleBorder* bubble_border_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(MenuScrollViewContainer); 70 DISALLOW_COPY_AND_ASSIGN(MenuScrollViewContainer);
71 }; 71 };
72 72
73 } // namespace views 73 } // namespace views
74 74
75 #endif // UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ 75 #endif // UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_runner_impl_cocoa.h ('k') | ui/views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698