Index: chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm |
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm |
index e1b9ad10616915abbac391c296f85f1856ca90da..a9d333bf36a74a65a188e83c096944f184abab4e 100644 |
--- a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm |
+++ b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm |
@@ -141,8 +141,23 @@ class ProfileInfoUpdateObserver : public ProfileInfoCacheObserver, |
- (void)showAvatarBubble:(NSView*)anchor |
withMode:(BrowserWindow::AvatarBubbleMode)mode |
withServiceType:(signin::GAIAServiceType)serviceType { |
- if (menuController_) |
+ if (menuController_) { |
+ if (switches::IsNewAvatarMenu()) { |
+ profiles::BubbleViewMode viewMode; |
+ profiles::TutorialMode tutorialMode; |
+ profiles::BubbleViewModeFromAvatarBubbleMode( |
+ mode, &viewMode, &tutorialMode); |
+ if (tutorialMode != profiles::TUTORIAL_MODE_NONE) { |
+ DCHECK([menuController_ isKindOfClass: |
+ [ProfileChooserController class]]); |
+ ProfileChooserController* profileChooserController = |
+ static_cast<ProfileChooserController*>(menuController_); |
Alexei Svitkine (slow)
2014/08/19 19:06:22
Use ObjCCast and remove the dcheck.
guohui
2014/08/19 19:51:03
Done.
|
+ [profileChooserController setTutorialMode:tutorialMode]; |
+ [profileChooserController initMenuContentsWithView:viewMode]; |
+ } |
+ } |
return; |
+ } |
DCHECK(chrome::IsCommandEnabled(browser_, IDC_SHOW_AVATAR_MENU)); |