Revamped signin/sync error surfacing on desktop user menu

chrome/browser/ui/views/profiles/profile_chooser_view.h

Index: chrome/browser/ui/views/profiles/profile_chooser_view.h
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.h b/chrome/browser/ui/views/profiles/profile_chooser_view.h
index 40db9078441c31592ed7b3800988c8c42aa73a23..795019a3b32a8500130d306ece806b61881e9215 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.h
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.h
@@ -211,6 +211,12 @@ class ProfileChooserView : public content::WebContentsDelegate,
       views::LabelButton** button,
       views::ImageButton** close_button);
 
+  // Creates a header for signin and sync error surfacing for the user menu.
+  views::View* CreateSyncErrorViewIfNeeded();
+  views::View* CreateSyncErrorView(const base::string16& content_text,
+                                   const base::string16& button_text,
+                                   views::LabelButton** button);

[msw, 2016/07/13 22:31:39]

nit: |button_out|?

[Jane, 2016/07/14 00:18:59]

Done.

+
   // Create a view that shows various options for an upgrade user who is not
   // the same person as the currently signed in user.
   views::View* CreateSwitchUserView();
@@ -238,6 +244,13 @@ class ProfileChooserView : public content::WebContentsDelegate,
   views::Link* tutorial_learn_more_link_;
   views::ImageButton* tutorial_close_button_;
 
+  // Buttons in the signin/sync error header on top of the desktop user menu.

[msw, 2016/07/13 22:31:39]

optional nit: move these below auth_error_email_button_

[Jane, 2016/07/14 00:18:58]

I put them here because this follows the flow in the code as well as the layout
(i.e. header sits above the profile card) so I think I will leave them here!

[msw, 2016/07/14 02:23:34]

Acknowledged.

+  views::LabelButton* sync_error_signin_button_;
+  views::LabelButton* sync_error_passphrase_button_;
+  views::LabelButton* sync_error_upgrade_button_;
+  views::LabelButton* sync_error_signin_again_button_;
+  views::LabelButton* sync_error_signout_button_;
+
   // Links and buttons displayed in the active profile card.
   views::Link* manage_accounts_link_;
   views::LabelButton* manage_accounts_button_;