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

Side by Side Diff: ash/shelf/app_list_button.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/screensaver/screensaver_view_unittest.cc ('k') | ash/shelf/app_list_shelf_item_delegate.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 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_SHELF_APP_LIST_BUTTON_H_ 5 #ifndef ASH_SHELF_APP_LIST_BUTTON_H_
6 #define ASH_SHELF_APP_LIST_BUTTON_H_ 6 #define ASH_SHELF_APP_LIST_BUTTON_H_
7 7
8 #include "ui/views/controls/button/image_button.h" 8 #include "ui/views/controls/button/image_button.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 10 matching lines...) Expand all
21 ShelfButtonHost* host, 21 ShelfButtonHost* host,
22 ShelfWidget* shelf_widget); 22 ShelfWidget* shelf_widget);
23 virtual ~AppListButton(); 23 virtual ~AppListButton();
24 24
25 bool draw_background_as_active() { 25 bool draw_background_as_active() {
26 return draw_background_as_active_; 26 return draw_background_as_active_;
27 } 27 }
28 28
29 protected: 29 protected:
30 // views::ImageButton overrides: 30 // views::ImageButton overrides:
31 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 31 virtual bool OnMousePressed(const ui::MouseEvent& event) override;
32 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; 32 virtual void OnMouseReleased(const ui::MouseEvent& event) override;
33 virtual void OnMouseCaptureLost() OVERRIDE; 33 virtual void OnMouseCaptureLost() override;
34 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; 34 virtual bool OnMouseDragged(const ui::MouseEvent& event) override;
35 virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; 35 virtual void OnMouseMoved(const ui::MouseEvent& event) override;
36 virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; 36 virtual void OnMouseEntered(const ui::MouseEvent& event) override;
37 virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; 37 virtual void OnMouseExited(const ui::MouseEvent& event) override;
38 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 38 virtual void OnPaint(gfx::Canvas* canvas) override;
39 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 39 virtual void GetAccessibleState(ui::AXViewState* state) override;
40 40
41 // ui::EventHandler overrides: 41 // ui::EventHandler overrides:
42 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 42 virtual void OnGestureEvent(ui::GestureEvent* event) override;
43 43
44 private: 44 private:
45 // Toggles the active state for painting the background and schedules a paint. 45 // Toggles the active state for painting the background and schedules a paint.
46 void SetDrawBackgroundAsActive(bool draw_background_as_active); 46 void SetDrawBackgroundAsActive(bool draw_background_as_active);
47 47
48 // True if the background should render as active, regardless of the state of 48 // True if the background should render as active, regardless of the state of
49 // the application list. 49 // the application list.
50 bool draw_background_as_active_; 50 bool draw_background_as_active_;
51 51
52 ShelfButtonHost* host_; 52 ShelfButtonHost* host_;
53 // Reference to the shelf widget containing this button, owned by the 53 // Reference to the shelf widget containing this button, owned by the
54 // root window controller. 54 // root window controller.
55 ShelfWidget* shelf_widget_; 55 ShelfWidget* shelf_widget_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(AppListButton); 57 DISALLOW_COPY_AND_ASSIGN(AppListButton);
58 }; 58 };
59 59
60 } // namespace ash 60 } // namespace ash
61 61
62 #endif // ASH_SHELF_APP_LIST_BUTTON_H_ 62 #endif // ASH_SHELF_APP_LIST_BUTTON_H_
OLDNEW
« no previous file with comments | « ash/screensaver/screensaver_view_unittest.cc ('k') | ash/shelf/app_list_shelf_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698