Fix sign-in error strings.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 36 matching lines @@
   // Different views that can be displayed in the bubble.
   enum BubbleViewMode {
     // Shows a "fast profile switcher" view.
     BUBBLE_VIEW_MODE_PROFILE_CHOOSER,
     // Shows a list of accounts for the active user.
     BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT,
     // Shows a web view for primary sign in.
     BUBBLE_VIEW_MODE_GAIA_SIGNIN,
     // Shows a web view for adding secondary accounts.
     BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT,
+    // Shows a web view for reauthenticating an account.
+    BUBBLE_VIEW_MODE_GAIA_REAUTH,
     // Shows a view for confirming account removal.
     BUBBLE_VIEW_MODE_ACCOUNT_REMOVAL,
     // Shows a view for ending new profile management preview.
     BUBBLE_VIEW_MODE_END_PREVIEW
   };
 
   enum TutorialMode {
     TUTORIAL_MODE_NONE,             // No tutorial card shown.
     TUTORIAL_MODE_ENABLE_PREVIEW,   // The enable-mirror-preview tutorial shown.
     TUTORIAL_MODE_PREVIEW_ENABLED,  // The welcome-to-mirror tutorial shown.
@@ skipping 20 matching lines @@
   static void clear_close_on_deactivate_for_testing() {
     close_on_deactivate_for_testing_ = false;
   }
 
  private:
   friend class NewAvatarMenuButtonTest;
   FRIEND_TEST_ALL_PREFIXES(NewAvatarMenuButtonTest, SignOut);
 
   typedef std::vector<size_t> Indexes;
   typedef std::map<views::Button*, int> ButtonIndexes;
-  typedef std::map<views::Button*, std::string> AccountButtonIndexes;
+  typedef std::map<views::View*, std::string> AccountButtonIndexes;

[noms (inactive), 2014/05/11 19:21:25]

Why View? It's still a Button* that's getting added, I think.

[Roger Tawa OOO till Jul 10th, 2014/05/13 21:23:54]

Done.

 
   ProfileChooserView(views::View* anchor_view,
                      views::BubbleBorder::Arrow arrow,
                      const gfx::Rect& anchor_rect,
                      Browser* browser,
                      BubbleViewMode view_mode);
   virtual ~ProfileChooserView();
 
   // views::BubbleDelegateView:
   virtual void Init() OVERRIDE;
@@ skipping 44 matching lines @@
   views::View* CreateGuestProfileView();
   views::View* CreateOtherProfilesView(const Indexes& avatars_to_show);
   views::View* CreateOptionsView(bool enable_lock);
 
   // Account Management view for the profile |avatar_item|.
   views::View* CreateCurrentProfileAccountsView(
       const AvatarMenu::Item& avatar_item);
   void CreateAccountButton(views::GridLayout* layout,
                            const std::string& account,
                            bool is_primary_account,
+                           bool reauth_required,
                            int width);
 
   // Creates a webview showing the gaia signin page.
-  views::View* CreateGaiaSigninView(bool add_secondary_account);
+  views::View* CreateGaiaSigninView();
 
   // Creates a view to confirm account removal for |account_id_to_remove_|.
   views::View* CreateAccountRemovalView();
 
   // Removes the currently selected account and attempts to restart Chrome.
   void RemoveAccount();
 
   // Creates a a tutorial card at the top prompting the user to try out the new
   // profile management UI.
   views::View* CreateNewProfileManagementPreviewView();
@@ skipping 24 matching lines @@
       views::LabelButton** button);
 
   views::View* CreateEndPreviewView();
 
   scoped_ptr<AvatarMenu> avatar_menu_;
   Browser* browser_;
 
   // Other profiles used in the "fast profile switcher" view.
   ButtonIndexes open_other_profile_indexes_map_;
 
-  // Accounts associated with the current profile.
-  AccountButtonIndexes current_profile_accounts_map_;
+  // Buttons associated with the current profile.
+  AccountButtonIndexes delete_account_button_map_;
+  AccountButtonIndexes reauth_account_button_map_;
 
   // Links and buttons displayed in the tutorial card.
   views::Link* tutorial_learn_more_link_;
   views::LabelButton* tutorial_ok_button_;
   views::LabelButton* tutorial_enable_new_profile_management_button_;
   views::Link* tutorial_end_preview_link_;
   views::LabelButton* tutorial_send_feedback_button_;
 
   // Links and buttons displayed in the active profile card.
   views::Link* manage_accounts_link_;
@@ skipping 27 matching lines @@
   // Active view mode.
   BubbleViewMode view_mode_;
 
   // The current tutorial mode.
   TutorialMode tutorial_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_