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

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

Issue 2920853004: [sync] Display an error when sync settings aren't confirmed (Closed)
Patch Set: fix compile Created 3 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 // Buttons associated with the current profile. 171 // Buttons associated with the current profile.
172 AccountButtonIndexes delete_account_button_map_; 172 AccountButtonIndexes delete_account_button_map_;
173 AccountButtonIndexes reauth_account_button_map_; 173 AccountButtonIndexes reauth_account_button_map_;
174 174
175 // Buttons in the signin/sync error header on top of the desktop user menu. 175 // Buttons in the signin/sync error header on top of the desktop user menu.
176 views::LabelButton* sync_error_signin_button_; 176 views::LabelButton* sync_error_signin_button_;
177 views::LabelButton* sync_error_passphrase_button_; 177 views::LabelButton* sync_error_passphrase_button_;
178 views::LabelButton* sync_error_upgrade_button_; 178 views::LabelButton* sync_error_upgrade_button_;
179 views::LabelButton* sync_error_signin_again_button_; 179 views::LabelButton* sync_error_signin_again_button_;
180 views::LabelButton* sync_error_signout_button_; 180 views::LabelButton* sync_error_signout_button_;
181 views::LabelButton* sync_error_settings_unconfirmed_button_;
sky 2017/06/07 20:25:04 Don't you need to initialize this to null?
Patrick Noland 2017/06/08 18:47:02 Good catch. It looks like this is done in ResetVie
181 182
182 // Links and buttons displayed in the active profile card. 183 // Links and buttons displayed in the active profile card.
183 views::Link* manage_accounts_link_; 184 views::Link* manage_accounts_link_;
184 views::LabelButton* manage_accounts_button_; 185 views::LabelButton* manage_accounts_button_;
185 views::LabelButton* signin_current_profile_button_; 186 views::LabelButton* signin_current_profile_button_;
186 views::LabelButton* auth_error_email_button_; 187 views::LabelButton* auth_error_email_button_;
187 188
188 // For material design user menu, the active profile card owns the profile 189 // For material design user menu, the active profile card owns the profile
189 // name and photo. 190 // name and photo.
190 views::LabelButton* current_profile_card_; 191 views::LabelButton* current_profile_card_;
(...skipping 28 matching lines...) Expand all
219 // The GAIA service type provided in the response header. 220 // The GAIA service type provided in the response header.
220 signin::GAIAServiceType gaia_service_type_; 221 signin::GAIAServiceType gaia_service_type_;
221 222
222 // The current access point of sign in. 223 // The current access point of sign in.
223 const signin_metrics::AccessPoint access_point_; 224 const signin_metrics::AccessPoint access_point_;
224 225
225 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); 226 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
226 }; 227 };
227 228
228 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ 229 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698