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

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

Issue 24647003: Redesign of the avatar menu button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better fix for app/popup browser crash Created 7 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_PROFILE_CHOOSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILE_CHOOSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_PROFILE_CHOOSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_PROFILE_CHOOSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 static void Hide(); 48 static void Hide();
49 49
50 // We normally close the bubble any time it becomes inactive but this can lead 50 // We normally close the bubble any time it becomes inactive but this can lead
51 // to flaky tests where unexpected UI events are triggering this behavior. 51 // to flaky tests where unexpected UI events are triggering this behavior.
52 // Tests should call this with "false" for more consistent operation. 52 // Tests should call this with "false" for more consistent operation.
53 static void set_close_on_deactivate(bool close) { 53 static void set_close_on_deactivate(bool close) {
54 close_on_deactivate_ = close; 54 close_on_deactivate_ = close;
55 } 55 }
56 56
57 private: 57 private:
58 friend class AvatarMenuButtonTest; 58 friend class NewAvatarMenuButtonTest;
59 FRIEND_TEST_ALL_PREFIXES(AvatarMenuButtonTest, NewSignOut); 59 FRIEND_TEST_ALL_PREFIXES(NewAvatarMenuButtonTest, SignOut);
60 FRIEND_TEST_ALL_PREFIXES(AvatarMenuButtonTest, LaunchUserManagerScreen);
61 60
62 typedef std::vector<size_t> Indexes; 61 typedef std::vector<size_t> Indexes;
63 typedef std::map<views::Button*, int> ButtonIndexes; 62 typedef std::map<views::Button*, int> ButtonIndexes;
64 63
65 // Different views that can be displayed in the bubble. 64 // Different views that can be displayed in the bubble.
66 enum BubbleViewMode { 65 enum BubbleViewMode {
67 PROFILE_CHOOSER_VIEW, // Shows a "fast profile switcher" view. 66 PROFILE_CHOOSER_VIEW, // Shows a "fast profile switcher" view.
68 ACCOUNT_MANAGEMENT_VIEW, // Shows a list of accounts for the active user. 67 ACCOUNT_MANAGEMENT_VIEW, // Shows a list of accounts for the active user.
69 GAIA_SIGNIN_VIEW // Shows a web view with Gaia signin page. 68 GAIA_SIGNIN_VIEW // Shows a web view with Gaia signin page.
70 }; 69 };
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // Action buttons. 128 // Action buttons.
130 views::TextButton* guest_button_; 129 views::TextButton* guest_button_;
131 views::TextButton* end_guest_button_; 130 views::TextButton* end_guest_button_;
132 views::TextButton* add_user_button_; 131 views::TextButton* add_user_button_;
133 views::TextButton* users_button_; 132 views::TextButton* users_button_;
134 133
135 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); 134 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
136 }; 135 };
137 136
138 #endif // CHROME_BROWSER_UI_VIEWS_PROFILE_CHOOSER_VIEW_H_ 137 #endif // CHROME_BROWSER_UI_VIEWS_PROFILE_CHOOSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/new_avatar_menu_button_browsertest.cc ('k') | chrome/browser/ui/views/profile_chooser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698