Chromium Code Reviews| 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 b68f3b231bc9015de10960d5ea5a63854bbf5465..9a01b1631c994853da4154385576c75ee36faa31 100644 |
| --- a/chrome/browser/ui/views/profiles/profile_chooser_view.h |
| +++ b/chrome/browser/ui/views/profiles/profile_chooser_view.h |
| @@ -54,6 +54,8 @@ class ProfileChooserView : public views::BubbleDelegateView, |
| 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. |
| @@ -94,7 +96,7 @@ class ProfileChooserView : public views::BubbleDelegateView, |
| 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 adde
Roger Tawa OOO till Jul 10th
2014/05/13 21:23:54
Done.
|
| ProfileChooserView(views::View* anchor_view, |
| views::BubbleBorder::Arrow arrow, |
| @@ -159,10 +161,11 @@ class ProfileChooserView : public views::BubbleDelegateView, |
| 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(); |
| @@ -207,8 +210,9 @@ class ProfileChooserView : public views::BubbleDelegateView, |
| // 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_; |