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

Side by Side Diff: ash/system/chromeos/session/logout_button_tray.cc

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Workaround Created 5 years, 11 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 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 #include "ash/system/chromeos/session/logout_button_tray.h" 5 #include "ash/system/chromeos/session/logout_button_tray.h"
6 6
7 #include "ash/shelf/shelf_types.h" 7 #include "ash/shelf/shelf_types.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/chromeos/session/logout_confirmation_controller.h" 9 #include "ash/system/chromeos/session/logout_confirmation_controller.h"
10 #include "ash/system/status_area_widget.h" 10 #include "ash/system/status_area_widget.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_CENTER, 49 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_CENTER,
50 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_RIGHT, 50 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_RIGHT,
51 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_LEFT, 51 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_LEFT,
52 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM, 52 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM,
53 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_RIGHT 53 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_RIGHT
54 }; 54 };
55 55
56 class LogoutButton : public views::LabelButton { 56 class LogoutButton : public views::LabelButton {
57 public: 57 public:
58 LogoutButton(views::ButtonListener* listener); 58 LogoutButton(views::ButtonListener* listener);
59 virtual ~LogoutButton(); 59 ~LogoutButton() override;
60 60
61 private: 61 private:
62 DISALLOW_COPY_AND_ASSIGN(LogoutButton); 62 DISALLOW_COPY_AND_ASSIGN(LogoutButton);
63 }; 63 };
64 64
65 } // namespace 65 } // namespace
66 66
67 LogoutButton::LogoutButton(views::ButtonListener* listener) 67 LogoutButton::LogoutButton(views::ButtonListener* listener)
68 : views::LabelButton(listener, base::string16()) { 68 : views::LabelButton(listener, base::string16()) {
69 SetupLabelForTray(label()); 69 SetupLabelForTray(label());
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 UpdateVisibility(); 156 UpdateVisibility();
157 } 157 }
158 158
159 void LogoutButtonTray::UpdateVisibility() { 159 void LogoutButtonTray::UpdateVisibility() {
160 SetVisible(show_logout_button_in_tray_ && 160 SetVisible(show_logout_button_in_tray_ &&
161 login_status_ != user::LOGGED_IN_NONE && 161 login_status_ != user::LOGGED_IN_NONE &&
162 login_status_ != user::LOGGED_IN_LOCKED); 162 login_status_ != user::LOGGED_IN_LOCKED);
163 } 163 }
164 164
165 } // namespace ash 165 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/session/logout_button_tray.h ('k') | ash/system/chromeos/session/logout_confirmation_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698