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

Side by Side Diff: chrome/browser/ui/views/profiles/profile_chooser_view.h

Issue 2023093002: Reflow of the profile items in desktop user menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-profile-icon
Patch Set: Test fix 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/profiles/profile_chooser_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 CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 // bubble, options buttons, tutorials). 141 // bubble, options buttons, tutorials).
142 void PopulateCompleteProfileChooserView(views::GridLayout* layout, 142 void PopulateCompleteProfileChooserView(views::GridLayout* layout,
143 AvatarMenu* avatar_menu); 143 AvatarMenu* avatar_menu);
144 144
145 // Creates the main profile card for the profile |avatar_item|. |is_guest| 145 // Creates the main profile card for the profile |avatar_item|. |is_guest|
146 // is used to determine whether to show any Sign in/Sign out/Manage accounts 146 // is used to determine whether to show any Sign in/Sign out/Manage accounts
147 // links. 147 // links.
148 views::View* CreateCurrentProfileView( 148 views::View* CreateCurrentProfileView(
149 const AvatarMenu::Item& avatar_item, 149 const AvatarMenu::Item& avatar_item,
150 bool is_guest); 150 bool is_guest);
151 views::View* CreateMaterialDesignCurrentProfileView(
152 const AvatarMenu::Item& avatar_item,
153 bool is_guest);
151 views::View* CreateGuestProfileView(); 154 views::View* CreateGuestProfileView();
152 views::View* CreateOtherProfilesView(const Indexes& avatars_to_show); 155 views::View* CreateOtherProfilesView(const Indexes& avatars_to_show);
153 views::View* CreateOptionsView(bool display_lock, AvatarMenu* avatar_menu); 156 views::View* CreateOptionsView(bool display_lock, AvatarMenu* avatar_menu);
154 views::View* CreateSupervisedUserDisclaimerView(); 157 views::View* CreateSupervisedUserDisclaimerView();
155 158
156 // Account Management view for the profile |avatar_item|. 159 // Account Management view for the profile |avatar_item|.
157 views::View* CreateCurrentProfileAccountsView( 160 views::View* CreateCurrentProfileAccountsView(
158 const AvatarMenu::Item& avatar_item); 161 const AvatarMenu::Item& avatar_item);
159 void CreateAccountButton(views::GridLayout* layout, 162 void CreateAccountButton(views::GridLayout* layout,
160 const std::string& account_id, 163 const std::string& account_id,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 // Links and buttons displayed in the tutorial card. 233 // Links and buttons displayed in the tutorial card.
231 views::LabelButton* tutorial_sync_settings_ok_button_; 234 views::LabelButton* tutorial_sync_settings_ok_button_;
232 views::Link* tutorial_sync_settings_link_; 235 views::Link* tutorial_sync_settings_link_;
233 views::LabelButton* tutorial_see_whats_new_button_; 236 views::LabelButton* tutorial_see_whats_new_button_;
234 views::Link* tutorial_not_you_link_; 237 views::Link* tutorial_not_you_link_;
235 views::Link* tutorial_learn_more_link_; 238 views::Link* tutorial_learn_more_link_;
236 views::ImageButton* tutorial_close_button_; 239 views::ImageButton* tutorial_close_button_;
237 240
238 // Links and buttons displayed in the active profile card. 241 // Links and buttons displayed in the active profile card.
239 views::Link* manage_accounts_link_; 242 views::Link* manage_accounts_link_;
240 views::LabelButton* signin_current_profile_link_; 243 views::LabelButton* signin_current_profile_button_;
241 views::LabelButton* auth_error_email_button_; 244 views::LabelButton* auth_error_email_button_;
242 245
243 // The profile name and photo in the active profile card. Owned by the 246 // The profile name and photo in the active profile card. Owned by the
244 // views hierarchy. 247 // views hierarchy.
245 EditableProfilePhoto* current_profile_photo_; 248 EditableProfilePhoto* current_profile_photo_;
246 EditableProfileName* current_profile_name_; 249 EditableProfileName* current_profile_name_;
247 250
248 // Action buttons. 251 // Action buttons.
249 views::LabelButton* guest_profile_button_; 252 views::LabelButton* guest_profile_button_;
250 views::LabelButton* users_button_; 253 views::LabelButton* users_button_;
(...skipping 26 matching lines...) Expand all
277 // The GAIA service type provided in the response header. 280 // The GAIA service type provided in the response header.
278 signin::GAIAServiceType gaia_service_type_; 281 signin::GAIAServiceType gaia_service_type_;
279 282
280 // The current access point of sign in. 283 // The current access point of sign in.
281 const signin_metrics::AccessPoint access_point_; 284 const signin_metrics::AccessPoint access_point_;
282 285
283 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); 286 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
284 }; 287 };
285 288
286 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ 289 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/profiles/profile_chooser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698