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 daa6b383a9cbb009daed2715af3103486f747037..93ea11764247da03a47f8b1f50f96ffaeedf8ed3 100644 |
| --- a/chrome/browser/ui/views/frame/browser_view.cc |
| +++ b/chrome/browser/ui/views/frame/browser_view.cc |
| @@ -2522,6 +2522,9 @@ void BrowserView::ShowAvatarBubbleFromAvatarButton( |
| AvatarBubbleMode mode, |
| const signin::ManageAccountsParams& manage_accounts_params) { |
| #if defined(FRAME_AVATAR_BUTTON) |
| + // Do not show avatar bubble if there is no avatar menu button. |
|
msw
2015/09/14 17:12:04
Instead of a no-op, just use the chrome menu butto
|
| + if (!frame_->GetNewAvatarMenuButton()) |
| + return; |
| profiles::BubbleViewMode bubble_view_mode; |
| profiles::TutorialMode tutorial_mode; |
| profiles::BubbleViewModeFromAvatarBubbleMode(mode, &bubble_view_mode, |