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

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

Issue 2099793002: mash: Migrate some system user files to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup Created 4 years, 5 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 <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/common/shelf/shelf_types.h" 10 #include "ash/common/shelf/shelf_types.h"
11 #include "ash/common/system/tray/system_tray_delegate.h" 11 #include "ash/common/system/tray/system_tray_delegate.h"
12 #include "ash/common/system/tray/tray_constants.h" 12 #include "ash/common/system/tray/tray_constants.h"
13 #include "ash/common/system/tray/tray_utils.h" 13 #include "ash/common/system/tray/tray_utils.h"
14 #include "ash/common/system/user/login_status.h"
14 #include "ash/common/wm_shell.h" 15 #include "ash/common/wm_shell.h"
15 #include "ash/shell.h" 16 #include "ash/shell.h"
16 #include "ash/system/chromeos/session/logout_confirmation_controller.h" 17 #include "ash/system/chromeos/session/logout_confirmation_controller.h"
17 #include "ash/system/status_area_widget.h" 18 #include "ash/system/status_area_widget.h"
18 #include "ash/system/tray/system_tray_notifier.h" 19 #include "ash/system/tray/system_tray_notifier.h"
19 #include "base/logging.h" 20 #include "base/logging.h"
20 #include "grit/ash_resources.h" 21 #include "grit/ash_resources.h"
21 #include "third_party/skia/include/core/SkColor.h" 22 #include "third_party/skia/include/core/SkColor.h"
22 #include "ui/events/event.h" 23 #include "ui/events/event.h"
23 #include "ui/gfx/geometry/insets.h" 24 #include "ui/gfx/geometry/insets.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 UpdateVisibility(); 156 UpdateVisibility();
156 } 157 }
157 158
158 void LogoutButtonTray::UpdateVisibility() { 159 void LogoutButtonTray::UpdateVisibility() {
159 SetVisible(show_logout_button_in_tray_ && 160 SetVisible(show_logout_button_in_tray_ &&
160 login_status_ != LoginStatus::NOT_LOGGED_IN && 161 login_status_ != LoginStatus::NOT_LOGGED_IN &&
161 login_status_ != LoginStatus::LOCKED); 162 login_status_ != LoginStatus::LOCKED);
162 } 163 }
163 164
164 } // namespace ash 165 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698