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

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

Issue 2151513002: Revamped signin/sync error surfacing on desktop user menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed rogerta's last comment 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
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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 profiles::TutorialMode tutorial_mode, 204 profiles::TutorialMode tutorial_mode,
205 const base::string16& title_text, 205 const base::string16& title_text,
206 const base::string16& content_text, 206 const base::string16& content_text,
207 const base::string16& link_text, 207 const base::string16& link_text,
208 const base::string16& button_text, 208 const base::string16& button_text,
209 bool stack_button, 209 bool stack_button,
210 views::Link** link, 210 views::Link** link,
211 views::LabelButton** button, 211 views::LabelButton** button,
212 views::ImageButton** close_button); 212 views::ImageButton** close_button);
213 213
214 // Creates a header for signin and sync error surfacing for the user menu.
215 views::View* CreateSyncErrorViewIfNeeded();
216 views::View* CreateSyncErrorView(const int content_string_id,
217 const int button_string_id,
218 views::LabelButton** button_out);
219
214 // Create a view that shows various options for an upgrade user who is not 220 // Create a view that shows various options for an upgrade user who is not
215 // the same person as the currently signed in user. 221 // the same person as the currently signed in user.
216 views::View* CreateSwitchUserView(); 222 views::View* CreateSwitchUserView();
217 223
218 bool ShouldShowGoIncognito() const; 224 bool ShouldShowGoIncognito() const;
219 225
220 // Clean-up done after an action was performed in the ProfileChooser. 226 // Clean-up done after an action was performed in the ProfileChooser.
221 void PostActionPerformed(ProfileMetrics::ProfileDesktopMenu action_performed); 227 void PostActionPerformed(ProfileMetrics::ProfileDesktopMenu action_performed);
222 228
223 std::unique_ptr<AvatarMenu> avatar_menu_; 229 std::unique_ptr<AvatarMenu> avatar_menu_;
224 Browser* browser_; 230 Browser* browser_;
225 231
226 // Other profiles used in the "fast profile switcher" view. 232 // Other profiles used in the "fast profile switcher" view.
227 ButtonIndexes open_other_profile_indexes_map_; 233 ButtonIndexes open_other_profile_indexes_map_;
228 234
229 // Buttons associated with the current profile. 235 // Buttons associated with the current profile.
230 AccountButtonIndexes delete_account_button_map_; 236 AccountButtonIndexes delete_account_button_map_;
231 AccountButtonIndexes reauth_account_button_map_; 237 AccountButtonIndexes reauth_account_button_map_;
232 238
233 // Links and buttons displayed in the tutorial card. 239 // Links and buttons displayed in the tutorial card.
234 views::LabelButton* tutorial_sync_settings_ok_button_; 240 views::LabelButton* tutorial_sync_settings_ok_button_;
235 views::Link* tutorial_sync_settings_link_; 241 views::Link* tutorial_sync_settings_link_;
236 views::LabelButton* tutorial_see_whats_new_button_; 242 views::LabelButton* tutorial_see_whats_new_button_;
237 views::Link* tutorial_not_you_link_; 243 views::Link* tutorial_not_you_link_;
238 views::Link* tutorial_learn_more_link_; 244 views::Link* tutorial_learn_more_link_;
239 views::ImageButton* tutorial_close_button_; 245 views::ImageButton* tutorial_close_button_;
240 246
247 // Buttons in the signin/sync error header on top of the desktop user menu.
248 views::LabelButton* sync_error_signin_button_;
249 views::LabelButton* sync_error_passphrase_button_;
250 views::LabelButton* sync_error_upgrade_button_;
251 views::LabelButton* sync_error_signin_again_button_;
252 views::LabelButton* sync_error_signout_button_;
253
241 // Links and buttons displayed in the active profile card. 254 // Links and buttons displayed in the active profile card.
242 views::Link* manage_accounts_link_; 255 views::Link* manage_accounts_link_;
243 views::LabelButton* manage_accounts_button_; 256 views::LabelButton* manage_accounts_button_;
244 views::LabelButton* signin_current_profile_button_; 257 views::LabelButton* signin_current_profile_button_;
245 views::LabelButton* auth_error_email_button_; 258 views::LabelButton* auth_error_email_button_;
246 259
247 // The profile name and photo in the active profile card in non-material- 260 // The profile name and photo in the active profile card in non-material-
248 // design user menu. Owned by the views hierarchy. 261 // design user menu. Owned by the views hierarchy.
249 EditableProfilePhoto* current_profile_photo_; 262 EditableProfilePhoto* current_profile_photo_;
250 EditableProfileName* current_profile_name_; 263 EditableProfileName* current_profile_name_;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 // The GAIA service type provided in the response header. 297 // The GAIA service type provided in the response header.
285 signin::GAIAServiceType gaia_service_type_; 298 signin::GAIAServiceType gaia_service_type_;
286 299
287 // The current access point of sign in. 300 // The current access point of sign in.
288 const signin_metrics::AccessPoint access_point_; 301 const signin_metrics::AccessPoint access_point_;
289 302
290 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); 303 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
291 }; 304 };
292 305
293 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ 306 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/profiles/new_avatar_button.cc ('k') | chrome/browser/ui/views/profiles/profile_chooser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698