Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3555)

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 53153009: When the new profile management flag is enabled, make sure to use the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't simulate mouse events Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(

Powered by Google App Engine
This is Rietveld 408576698