| Index: chrome/browser/ui/views/frame/avatar_button_manager.cc
|
| diff --git a/chrome/browser/ui/views/frame/avatar_button_manager.cc b/chrome/browser/ui/views/frame/avatar_button_manager.cc
|
| index fa8b44816ca6663869e764b75a661805201154d2..442243c54e280da56678a7099ce8ec004ddd7ba6 100644
|
| --- a/chrome/browser/ui/views/frame/avatar_button_manager.cc
|
| +++ b/chrome/browser/ui/views/frame/avatar_button_manager.cc
|
| @@ -31,7 +31,7 @@ void AvatarButtonManager::Update(AvatarButtonStyle style) {
|
| // Desktop guest shows the avatar button.
|
| browser_view->IsIncognito()) {
|
| if (!view_) {
|
| - view_ = new NewAvatarButton(this, style, profile);
|
| + view_ = new AvatarButton(this, style, profile);
|
| view_->set_id(VIEW_ID_AVATAR_BUTTON);
|
| frame_view_->AddChildView(view_);
|
| frame->GetRootView()->Layout();
|
| @@ -43,18 +43,8 @@ void AvatarButtonManager::Update(AvatarButtonStyle style) {
|
| }
|
| }
|
|
|
| -void AvatarButtonManager::ButtonPreferredSizeChanged() {
|
| - // Perform a re-layout if the avatar button has changed, since that can affect
|
| - // the size of the tabs.
|
| - if (!view_ || !frame_view_->browser_view()->initialized())
|
| - return; // Ignore the update during view creation.
|
| -
|
| - frame_view_->InvalidateLayout();
|
| - frame_view_->frame()->GetRootView()->Layout();
|
| -}
|
| -
|
| void AvatarButtonManager::ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) {
|
| + const ui::Event& event) {
|
| DCHECK_EQ(view_, sender);
|
| BrowserWindow::AvatarBubbleMode mode =
|
| BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT;
|
|
|