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

Side by Side Diff: ash/system/status_area_widget.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/overview/overview_button_tray.h ('k') | ash/system/status_area_widget_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 (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_H_ 5 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_H_
6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_H_ 6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_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/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 bool ShouldShowShelf() const; 65 bool ShouldShowShelf() const;
66 66
67 // True if any message bubble is shown. 67 // True if any message bubble is shown.
68 bool IsMessageBubbleShown() const; 68 bool IsMessageBubbleShown() const;
69 69
70 // Notifies child trays, and the |status_area_widget_delegate_| to schedule a 70 // Notifies child trays, and the |status_area_widget_delegate_| to schedule a
71 // paint. 71 // paint.
72 void SchedulePaint(); 72 void SchedulePaint();
73 73
74 // Overridden from views::Widget: 74 // Overridden from views::Widget:
75 virtual void OnNativeWidgetActivationChanged(bool active) OVERRIDE; 75 virtual void OnNativeWidgetActivationChanged(bool active) override;
76 76
77 private: 77 private:
78 void AddSystemTray(); 78 void AddSystemTray();
79 void AddWebNotificationTray(); 79 void AddWebNotificationTray();
80 #if defined(OS_CHROMEOS) 80 #if defined(OS_CHROMEOS)
81 void AddLogoutButtonTray(); 81 void AddLogoutButtonTray();
82 void AddVirtualKeyboardTray(); 82 void AddVirtualKeyboardTray();
83 #endif 83 #endif
84 void AddOverviewButtonTray(); 84 void AddOverviewButtonTray();
85 85
86 // Weak pointers to View classes that are parented to StatusAreaWidget: 86 // Weak pointers to View classes that are parented to StatusAreaWidget:
87 StatusAreaWidgetDelegate* status_area_widget_delegate_; 87 StatusAreaWidgetDelegate* status_area_widget_delegate_;
88 OverviewButtonTray* overview_button_tray_; 88 OverviewButtonTray* overview_button_tray_;
89 SystemTray* system_tray_; 89 SystemTray* system_tray_;
90 WebNotificationTray* web_notification_tray_; 90 WebNotificationTray* web_notification_tray_;
91 #if defined(OS_CHROMEOS) 91 #if defined(OS_CHROMEOS)
92 LogoutButtonTray* logout_button_tray_; 92 LogoutButtonTray* logout_button_tray_;
93 VirtualKeyboardTray* virtual_keyboard_tray_; 93 VirtualKeyboardTray* virtual_keyboard_tray_;
94 #endif 94 #endif
95 user::LoginStatus login_status_; 95 user::LoginStatus login_status_;
96 96
97 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); 97 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
98 }; 98 };
99 99
100 } // namespace ash 100 } // namespace ash
101 101
102 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ 102 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/system/overview/overview_button_tray.h ('k') | ash/system/status_area_widget_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698