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 6acf4bc7fd53c61d62fbac8a854ffe6acea803a6..7112c9d3255b565859a11d237b3412416f9fe49b 100644 |
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.h |
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.h |
@@ -10,6 +10,7 @@ |
#include "chrome/browser/profiles/avatar_menu.h" |
#include "chrome/browser/profiles/avatar_menu_observer.h" |
+#include "chrome/browser/profiles/profile_metrics.h" |
#include "chrome/browser/ui/browser_window.h" |
#include "google_apis/gaia/oauth2_token_service.h" |
#include "ui/views/bubble/bubble_delegate.h" |
@@ -75,6 +76,7 @@ class ProfileChooserView : public views::BubbleDelegateView, |
// showing it will appear while if it is showing, nothing will happen here and |
// the existing bubble will auto-close due to focus loss. |
static void ShowBubble(BubbleViewMode view_mode, |
+ signin::GAIA_SERVICE_TYPE service_type, |
views::View* anchor_view, |
views::BubbleBorder::Arrow arrow, |
views::BubbleBorder::BubbleAlignment border_alignment, |
@@ -102,7 +104,8 @@ class ProfileChooserView : public views::BubbleDelegateView, |
views::BubbleBorder::Arrow arrow, |
const gfx::Rect& anchor_rect, |
Browser* browser, |
- BubbleViewMode view_mode); |
+ BubbleViewMode view_mode, |
+ signin::GAIA_SERVICE_TYPE service_type); |
virtual ~ProfileChooserView(); |
// views::BubbleDelegateView: |
@@ -204,6 +207,9 @@ class ProfileChooserView : public views::BubbleDelegateView, |
views::View* CreateEndPreviewView(); |
+ // Clean-up done after an action was performed in the ProfileChooser. |
+ void PostActionPerformed(ProfileMetrics::ProfileDesktopMenu action_performed); |
+ |
scoped_ptr<AvatarMenu> avatar_menu_; |
Browser* browser_; |
@@ -256,6 +262,9 @@ class ProfileChooserView : public views::BubbleDelegateView, |
// The current tutorial mode. |
TutorialMode tutorial_mode_; |
+ // The GAIA service type provided in the response header. |
+ signin::GAIA_SERVICE_TYPE gaia_service_type_; |
sky
2014/05/23 19:55:22
const
Mike Lerman
2014/05/23 20:13:04
It originally was but I am now re-assigning the va
|
+ |
DISALLOW_COPY_AND_ASSIGN(ProfileChooserView); |
}; |