| OLD | NEW |
| 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 <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 // We normally close the bubble any time it becomes inactive but this can lead | 115 // We normally close the bubble any time it becomes inactive but this can lead |
| 116 // to flaky tests where unexpected UI events are triggering this behavior. | 116 // to flaky tests where unexpected UI events are triggering this behavior. |
| 117 // Tests set this to "false" for more consistent operation. | 117 // Tests set this to "false" for more consistent operation. |
| 118 static bool close_on_deactivate_for_testing_; | 118 static bool close_on_deactivate_for_testing_; |
| 119 | 119 |
| 120 void ResetView(); | 120 void ResetView(); |
| 121 | 121 |
| 122 // Shows the bubble with the |view_to_display|. | 122 // Shows the bubble with the |view_to_display|. |
| 123 void ShowView(profiles::BubbleViewMode view_to_display, | 123 void ShowView(profiles::BubbleViewMode view_to_display, |
| 124 AvatarMenu* avatar_menu); | 124 AvatarMenu* avatar_menu); |
| 125 void ShowViewFromMode(profiles::BubbleViewMode mode); |
| 125 | 126 |
| 126 // Creates the profile chooser view. | 127 // Creates the profile chooser view. |
| 127 views::View* CreateProfileChooserView(AvatarMenu* avatar_menu); | 128 views::View* CreateProfileChooserView(AvatarMenu* avatar_menu); |
| 128 | 129 |
| 129 // Populates |layout| with only a list of the profiles available to | 130 // Populates |layout| with only a list of the profiles available to |
| 130 // switch to. | 131 // switch to. |
| 131 void PopulateMinimalProfileChooserView(views::GridLayout* layout, | 132 void PopulateMinimalProfileChooserView(views::GridLayout* layout, |
| 132 AvatarMenu* avatar_menu); | 133 AvatarMenu* avatar_menu); |
| 133 | 134 |
| 134 // Populates |layout| with all the elements of the Avatar Menu (current user | 135 // Populates |layout| with all the elements of the Avatar Menu (current user |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 // The current tutorial mode. | 267 // The current tutorial mode. |
| 267 profiles::TutorialMode tutorial_mode_; | 268 profiles::TutorialMode tutorial_mode_; |
| 268 | 269 |
| 269 // The GAIA service type provided in the response header. | 270 // The GAIA service type provided in the response header. |
| 270 signin::GAIAServiceType gaia_service_type_; | 271 signin::GAIAServiceType gaia_service_type_; |
| 271 | 272 |
| 272 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); | 273 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); |
| 273 }; | 274 }; |
| 274 | 275 |
| 275 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ | 276 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ |
| OLD | NEW |