Chromium Code Reviews| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 45 public views::TextfieldController, | 45 public views::TextfieldController, |
| 46 public AvatarMenuObserver, | 46 public AvatarMenuObserver, |
| 47 public OAuth2TokenService::Observer { | 47 public OAuth2TokenService::Observer { |
| 48 public: | 48 public: |
| 49 // Shows the bubble if one is not already showing. This allows us to easily | 49 // Shows the bubble if one is not already showing. This allows us to easily |
| 50 // make a button toggle the bubble on and off when clicked: we unconditionally | 50 // make a button toggle the bubble on and off when clicked: we unconditionally |
| 51 // call this function when the button is clicked and if the bubble isn't | 51 // call this function when the button is clicked and if the bubble isn't |
| 52 // showing it will appear while if it is showing, nothing will happen here and | 52 // showing it will appear while if it is showing, nothing will happen here and |
| 53 // the existing bubble will auto-close due to focus loss. | 53 // the existing bubble will auto-close due to focus loss. |
| 54 static void ShowBubble(profiles::BubbleViewMode view_mode, | 54 static void ShowBubble(profiles::BubbleViewMode view_mode, |
| 55 signin::GAIAServiceType service_type, | 55 const signin::ManageAccountsParams& |
| 56 manage_accounts_params, | |
| 56 views::View* anchor_view, | 57 views::View* anchor_view, |
| 57 views::BubbleBorder::Arrow arrow, | 58 views::BubbleBorder::Arrow arrow, |
| 58 views::BubbleBorder::BubbleAlignment border_alignment, | 59 views::BubbleBorder::BubbleAlignment border_alignment, |
| 59 const gfx::Rect& anchor_rect, | 60 const gfx::Rect& anchor_rect, |
| 60 Browser* browser); | 61 Browser* browser); |
|
Roger Tawa OOO till Jul 10th
2014/06/19 14:47:21
nit: move all args to below line 54 and indent by
sky
2014/06/19 16:03:06
+1
guohui
2014/06/19 17:44:19
Done.
| |
| 61 static bool IsShowing(); | 62 static bool IsShowing(); |
| 62 static void Hide(); | 63 static void Hide(); |
| 63 | 64 |
| 64 // We normally close the bubble any time it becomes inactive but this can lead | 65 // We normally close the bubble any time it becomes inactive but this can lead |
| 65 // to flaky tests where unexpected UI events are triggering this behavior. | 66 // to flaky tests where unexpected UI events are triggering this behavior. |
| 66 // Tests should call this with "false" for more consistent operation. | 67 // Tests should call this with "false" for more consistent operation. |
| 67 static void clear_close_on_deactivate_for_testing() { | 68 static void clear_close_on_deactivate_for_testing() { |
| 68 close_on_deactivate_for_testing_ = false; | 69 close_on_deactivate_for_testing_ = false; |
| 69 } | 70 } |
| 70 | 71 |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 239 // The current tutorial mode. | 240 // The current tutorial mode. |
| 240 profiles::TutorialMode tutorial_mode_; | 241 profiles::TutorialMode tutorial_mode_; |
| 241 | 242 |
| 242 // The GAIA service type provided in the response header. | 243 // The GAIA service type provided in the response header. |
| 243 signin::GAIAServiceType gaia_service_type_; | 244 signin::GAIAServiceType gaia_service_type_; |
| 244 | 245 |
| 245 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); | 246 DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); |
| 246 }; | 247 }; |
| 247 | 248 |
| 248 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ | 249 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ |
| OLD | NEW |