Chromium Code Reviews| Index: chrome/browser/ui/views/frame/browser_view.cc |
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
| index 6c5227623f475ccc76a017bdae277ab60fe43078..92a2d5150e34b17c207a609db13026f6f0f168e0 100644 |
| --- a/chrome/browser/ui/views/frame/browser_view.cc |
| +++ b/chrome/browser/ui/views/frame/browser_view.cc |
| @@ -27,6 +27,7 @@ |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/profiles/profile_info_cache.h" |
| #include "chrome/browser/profiles/profile_manager.h" |
| +#include "chrome/browser/profiles/profiles_state.h" |
| #include "chrome/browser/search/search.h" |
| #include "chrome/browser/sessions/tab_restore_service.h" |
| #include "chrome/browser/sessions/tab_restore_service_factory.h" |
| @@ -2573,9 +2574,18 @@ void BrowserView::ShowAvatarBubble(WebContents* web_contents, |
| } |
| void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
| - AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
| - if (button) |
| - button->ShowAvatarBubble(); |
| + if (profiles::IsNewProfileManagementEnabled()) { |
| + BrowserNonClientFrameView* frame_view = |
|
sky
2013/11/05 04:08:25
Here you can do: frame_->GetFrameView()... And if
|
| + static_cast<BrowserNonClientFrameView*>( |
| + views::Widget::GetWidgetForNativeView( |
| + browser_->window()->GetNativeWindow())-> |
| + non_client_view()->frame_view()); |
| + frame_view->ShowProfileChooserViewBubble(); |
| + } else { |
| + AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
| + if (button) |
| + button->ShowAvatarBubble(); |
| + } |
| } |
| void BrowserView::ShowPasswordGenerationBubble( |