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

Side by Side Diff: ash/system/status_area_widget_delegate.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/system/status_area_widget.h ('k') | ash/system/tray/actionable_view.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 (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_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ 6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf/shelf_types.h" 9 #include "ash/shelf/shelf_types.h"
10 #include "ash/wm/gestures/shelf_gesture_handler.h" 10 #include "ash/wm/gestures/shelf_gesture_handler.h"
(...skipping 15 matching lines...) Expand all
26 26
27 // Called whenever layout might change (e.g. alignment changed). 27 // Called whenever layout might change (e.g. alignment changed).
28 void UpdateLayout(); 28 void UpdateLayout();
29 29
30 // Sets the focus cycler. 30 // Sets the focus cycler.
31 void SetFocusCyclerForTesting(const FocusCycler* focus_cycler); 31 void SetFocusCyclerForTesting(const FocusCycler* focus_cycler);
32 32
33 void set_alignment(ShelfAlignment alignment) { alignment_ = alignment; } 33 void set_alignment(ShelfAlignment alignment) { alignment_ = alignment; }
34 34
35 // Overridden from views::AccessiblePaneView. 35 // Overridden from views::AccessiblePaneView.
36 virtual View* GetDefaultFocusableChild() OVERRIDE; 36 virtual View* GetDefaultFocusableChild() override;
37 37
38 // Overridden from views::View: 38 // Overridden from views::View:
39 virtual views::Widget* GetWidget() OVERRIDE; 39 virtual views::Widget* GetWidget() override;
40 virtual const views::Widget* GetWidget() const OVERRIDE; 40 virtual const views::Widget* GetWidget() const override;
41 41
42 // Overridden from ui::EventHandler: 42 // Overridden from ui::EventHandler:
43 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 43 virtual void OnGestureEvent(ui::GestureEvent* event) override;
44 44
45 // views::WidgetDelegate overrides: 45 // views::WidgetDelegate overrides:
46 virtual bool CanActivate() const OVERRIDE; 46 virtual bool CanActivate() const override;
47 virtual void DeleteDelegate() OVERRIDE; 47 virtual void DeleteDelegate() override;
48 48
49 protected: 49 protected:
50 // Overridden from views::View: 50 // Overridden from views::View:
51 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; 51 virtual void ChildPreferredSizeChanged(views::View* child) override;
52 virtual void ChildVisibilityChanged(views::View* child) OVERRIDE; 52 virtual void ChildVisibilityChanged(views::View* child) override;
53 53
54 private: 54 private:
55 void UpdateWidgetSize(); 55 void UpdateWidgetSize();
56 56
57 const FocusCycler* focus_cycler_for_testing_; 57 const FocusCycler* focus_cycler_for_testing_;
58 ShelfAlignment alignment_; 58 ShelfAlignment alignment_;
59 59
60 ShelfGestureHandler gesture_handler_; 60 ShelfGestureHandler gesture_handler_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate); 62 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate);
63 }; 63 };
64 64
65 } // namespace ash 65 } // namespace ash
66 66
67 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ 67 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/system/status_area_widget.h ('k') | ash/system/tray/actionable_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698