Fix static set_close_on_deactivate overriding non-virtual base method

chrome/browser/ui/views/avatar_menu_bubble_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
@@ skipping 459 matching lines @@
   layout->AddView(signout_button_);
   layout->AddView(manage_button_);
   SetLayoutManager(layout);
 }
 
 
 // AvatarMenuBubbleView -------------------------------------------------------
 
 // static
 AvatarMenuBubbleView* AvatarMenuBubbleView::avatar_bubble_ = NULL;
-bool AvatarMenuBubbleView::close_on_deactivate_ = true;
+bool AvatarMenuBubbleView::close_on_deactivate_for_testing_ = true;
 
 // static
 void AvatarMenuBubbleView::ShowBubble(
     views::View* anchor_view,
     views::BubbleBorder::Arrow arrow,
     views::BubbleBorder::BubbleAlignment border_alignment,
     const gfx::Rect& anchor_rect,
     Browser* browser) {
   if (IsShowing())
     return;
 
   DCHECK(chrome::IsCommandEnabled(browser, IDC_SHOW_AVATAR_MENU));
   avatar_bubble_ = new AvatarMenuBubbleView(
       anchor_view, arrow, anchor_rect, browser);
   views::BubbleDelegateView::CreateBubble(avatar_bubble_);
-  avatar_bubble_->set_close_on_deactivate(close_on_deactivate_);
+  avatar_bubble_->set_close_on_deactivate(close_on_deactivate_for_testing_);
   avatar_bubble_->SetBackgroundColors();
   avatar_bubble_->SetAlignment(border_alignment);
   avatar_bubble_->GetWidget()->Show();
 }
 
 // static
 bool AvatarMenuBubbleView::IsShowing() {
   return avatar_bubble_ != NULL;
 }
 
@@ skipping 297 matching lines @@
   Layout();
   if (GetBubbleFrameView())
     SizeToContents();
 }
 
 void AvatarMenuBubbleView::SetBackgroundColors() {
   for (size_t i = 0; i < item_views_.size(); ++i) {
     item_views_[i]->OnHighlightStateChanged();
   }
 }