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

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

Issue 2052473003: Reflow of user menu's active profile card into a button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@reflow-profile
Patch Set: Created 4 years, 6 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 #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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 241
242 // Links and buttons displayed in the active profile card. 242 // Links and buttons displayed in the active profile card.
243 views::Link* manage_accounts_link_; 243 views::Link* manage_accounts_link_;
244 views::LabelButton* signin_current_profile_link_; 244 views::LabelButton* signin_current_profile_link_;
245 views::LabelButton* auth_error_email_button_; 245 views::LabelButton* auth_error_email_button_;
246 246
247 // The profile name and photo in the active profile card. Owned by the 247 // The profile name and photo in the active profile card. Owned by the
248 // views hierarchy. 248 // views hierarchy.
249 EditableProfilePhoto* current_profile_photo_; 249 EditableProfilePhoto* current_profile_photo_;
250 EditableProfileName* current_profile_name_; 250 EditableProfileName* current_profile_name_;
251 // For material design user menu, the profile photo and profile name are added
252 // as child views to the same button.
253 views::LabelButton* current_profile_card_;
251 254
252 // Action buttons. 255 // Action buttons.
253 views::LabelButton* users_button_; 256 views::LabelButton* users_button_;
254 views::LabelButton* go_incognito_button_; 257 views::LabelButton* go_incognito_button_;
255 views::LabelButton* lock_button_; 258 views::LabelButton* lock_button_;
256 views::Link* add_account_link_; 259 views::Link* add_account_link_;
257 260
258 // Buttons displayed in the gaia signin view. 261 // Buttons displayed in the gaia signin view.
259 views::ImageButton* gaia_signin_cancel_button_; 262 views::ImageButton* gaia_signin_cancel_button_;
260 263
(...skipping 18 matching lines...) Expand all
279 // The GAIA service type provided in the response header. 282 // The GAIA service type provided in the response header.
280 signin::GAIAServiceType gaia_service_type_; 283 signin::GAIAServiceType gaia_service_type_;
281 284
282 // The current access point of sign in. 285 // The current access point of sign in.
283 const signin_metrics::AccessPoint access_point_; 286 const signin_metrics::AccessPoint access_point_;
284 287
285 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); 288 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
286 }; 289 };
287 290
288 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ 291 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698