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

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: Addressed comments from sky 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 // Links and buttons displayed in the tutorial card. 233 // Links and buttons displayed in the tutorial card.
234 views::LabelButton* tutorial_sync_settings_ok_button_; 234 views::LabelButton* tutorial_sync_settings_ok_button_;
235 views::Link* tutorial_sync_settings_link_; 235 views::Link* tutorial_sync_settings_link_;
236 views::LabelButton* tutorial_see_whats_new_button_; 236 views::LabelButton* tutorial_see_whats_new_button_;
237 views::Link* tutorial_not_you_link_; 237 views::Link* tutorial_not_you_link_;
238 views::Link* tutorial_learn_more_link_; 238 views::Link* tutorial_learn_more_link_;
239 views::ImageButton* tutorial_close_button_; 239 views::ImageButton* tutorial_close_button_;
240 240
241 // Links and buttons displayed in the active profile card. 241 // Links and buttons displayed in the active profile card.
242 views::Link* manage_accounts_link_; 242 views::Link* manage_accounts_link_;
243 views::LabelButton* manage_accounts_button_;
243 views::LabelButton* signin_current_profile_button_; 244 views::LabelButton* signin_current_profile_button_;
244 views::LabelButton* auth_error_email_button_; 245 views::LabelButton* auth_error_email_button_;
245 246
246 // The profile name and photo in the active profile card. Owned by the 247 // The profile name and photo in the active profile card in non-material-
247 // views hierarchy. 248 // design user menu. Owned by the views hierarchy.
248 EditableProfilePhoto* current_profile_photo_; 249 EditableProfilePhoto* current_profile_photo_;
249 EditableProfileName* current_profile_name_; 250 EditableProfileName* current_profile_name_;
251 // For material design user menu, the active profile card owns the profile
252 // name and photo.
253 views::LabelButton* current_profile_card_;
250 254
251 // Action buttons. 255 // Action buttons.
252 views::LabelButton* guest_profile_button_; 256 views::LabelButton* guest_profile_button_;
253 views::LabelButton* users_button_; 257 views::LabelButton* users_button_;
254 views::LabelButton* go_incognito_button_; 258 views::LabelButton* go_incognito_button_;
255 views::LabelButton* lock_button_; 259 views::LabelButton* lock_button_;
256 views::LabelButton* close_all_windows_button_; 260 views::LabelButton* close_all_windows_button_;
257 views::Link* add_account_link_; 261 views::Link* add_account_link_;
258 262
259 // Buttons displayed in the gaia signin view. 263 // Buttons displayed in the gaia signin view.
(...skipping 20 matching lines...) Expand all
280 // The GAIA service type provided in the response header. 284 // The GAIA service type provided in the response header.
281 signin::GAIAServiceType gaia_service_type_; 285 signin::GAIAServiceType gaia_service_type_;
282 286
283 // The current access point of sign in. 287 // The current access point of sign in.
284 const signin_metrics::AccessPoint access_point_; 288 const signin_metrics::AccessPoint access_point_;
285 289
286 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); 290 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
287 }; 291 };
288 292
289 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ 293 #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