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

Side by Side Diff: ash/common/system/user/user_view.h

Issue 2463163002: Update chromeos system menu buttons for MD. (Closed)
Patch Set: boxlayout has some annoying dchecks Created 4 years, 1 month 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/common/system/tray_accessibility.cc ('k') | ash/common/system/user/user_view.cc » ('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_COMMON_SYSTEM_USER_USER_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_USER_USER_VIEW_H_
6 #define ASH_COMMON_SYSTEM_USER_USER_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_USER_USER_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/common/session/session_types.h" 10 #include "ash/common/session/session_types.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 void AddLogoutButton(LoginStatus login); 67 void AddLogoutButton(LoginStatus login);
68 void AddUserCard(LoginStatus login); 68 void AddUserCard(LoginStatus login);
69 69
70 // Create the menu option to add another user. If |disabled| is set the user 70 // Create the menu option to add another user. If |disabled| is set the user
71 // cannot actively click on the item. 71 // cannot actively click on the item.
72 void ToggleAddUserMenuOption(); 72 void ToggleAddUserMenuOption();
73 73
74 // Removes the add user menu option. 74 // Removes the add user menu option.
75 void RemoveAddUserMenuOption(); 75 void RemoveAddUserMenuOption();
76 76
77 UserIndex user_index_; 77 const UserIndex user_index_;
78 // The view of the user card.
79 views::View* user_card_view_; 78 views::View* user_card_view_;
80 79
81 // This is the owner system tray item of this view. 80 // This is the owner system tray item of this view.
82 SystemTrayItem* owner_; 81 SystemTrayItem* owner_;
83 82
84 // True if |user_card_view_| is a |ButtonFromView| - otherwise it is only 83 // True if |user_card_view_| is a |ButtonFromView| - otherwise it is only
85 // a |UserCardView|. 84 // a |UserCardView|.
86 bool is_user_card_button_; 85 bool is_user_card_button_;
87 86
88 views::View* logout_button_; 87 views::View* logout_button_;
89 std::unique_ptr<PopupMessage> popup_message_; 88 std::unique_ptr<PopupMessage> popup_message_;
90 std::unique_ptr<views::Widget> add_menu_option_; 89 std::unique_ptr<views::Widget> add_menu_option_;
91 90
92 // False when the add user panel is visible but not activatable. 91 // False when the add user panel is visible but not activatable.
93 bool add_user_enabled_; 92 bool add_user_enabled_;
94 93
95 // The mouse watcher which takes care of out of window hover events. 94 // The mouse watcher which takes care of out of window hover events.
96 std::unique_ptr<views::MouseWatcher> mouse_watcher_; 95 std::unique_ptr<views::MouseWatcher> mouse_watcher_;
97 96
98 // The focus manager which we use to detect focus changes. 97 // The focus manager which we use to detect focus changes.
99 views::FocusManager* focus_manager_; 98 views::FocusManager* focus_manager_;
100 99
101 DISALLOW_COPY_AND_ASSIGN(UserView); 100 DISALLOW_COPY_AND_ASSIGN(UserView);
102 }; 101 };
103 102
104 } // namespace tray 103 } // namespace tray
105 } // namespace ash 104 } // namespace ash
106 105
107 #endif // ASH_COMMON_SYSTEM_USER_USER_VIEW_H_ 106 #endif // ASH_COMMON_SYSTEM_USER_USER_VIEW_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray_accessibility.cc ('k') | ash/common/system/user/user_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698