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

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

Issue 2678353005: Remove pre-MD code related to tray/menu user profiles. (Closed)
Patch Set: back out a11y changes and rebase Created 3 years, 10 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/common/system/user/tray_user_separator.cc ('k') | ash/common/system/user/user_card_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_CARD_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_USER_USER_CARD_VIEW_H_
6 #define ASH_COMMON_SYSTEM_USER_USER_CARD_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_USER_USER_CARD_VIEW_H_
7 7
8 #include "ash/common/media_controller.h" 8 #include "ash/common/media_controller.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 23 matching lines...) Expand all
34 void GetAccessibleNodeData(ui::AXNodeData* node_data) override; 34 void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
35 35
36 // MediaCaptureObserver: 36 // MediaCaptureObserver:
37 void OnMediaCaptureChanged( 37 void OnMediaCaptureChanged(
38 const std::vector<mojom::MediaCaptureState>& capture_states) override; 38 const std::vector<mojom::MediaCaptureState>& capture_states) override;
39 39
40 private: 40 private:
41 // Creates the content for the public mode. 41 // Creates the content for the public mode.
42 void AddPublicModeUserContent(int max_width); 42 void AddPublicModeUserContent(int max_width);
43 43
44 void AddUserContent(LoginStatus login_status); 44 void AddUserContent(views::BoxLayout* layout, LoginStatus login_status);
45 void AddUserContentMd(views::BoxLayout* layout, LoginStatus login_status);
46 45
47 bool is_active_user() const { return !user_index_; } 46 bool is_active_user() const { return !user_index_; }
48 47
49 int user_index_; 48 int user_index_;
50 49
51 views::Label* user_name_; 50 views::Label* user_name_;
52 views::Label* media_capture_label_; 51 views::Label* media_capture_label_;
53 views::ImageView* media_capture_icon_; 52 views::ImageView* media_capture_icon_;
54 53
55 DISALLOW_COPY_AND_ASSIGN(UserCardView); 54 DISALLOW_COPY_AND_ASSIGN(UserCardView);
56 }; 55 };
57 56
58 } // namespace tray 57 } // namespace tray
59 } // namespace ash 58 } // namespace ash
60 59
61 #endif // ASH_COMMON_SYSTEM_USER_USER_CARD_VIEW_H_ 60 #endif // ASH_COMMON_SYSTEM_USER_USER_CARD_VIEW_H_
OLDNEW
« no previous file with comments | « ash/common/system/user/tray_user_separator.cc ('k') | ash/common/system/user/user_card_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698