Merge 53739 - Cleanup: Remove dead code (was only called when we had app + pa...

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2010 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/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
@@ skipping 629 matching lines @@
     transparent.allocPixels();
     transparent.eraseARGB(0, 0, 0, 0);
     badge = SkBitmapOperations::CreateBlendedBitmap(
         *dot, transparent, 1.0 - update_reminder_animation_->GetCurrentValue());
     if (update_reminder_animation_->GetCurrentValue() == 1.0)
       has_faded_in = true;
   } else {
     // Convert animation values that start from 0.0 and incrementally go
     // up to 1.0 into values that start in 0.0, go to 1.0 and then back
     // to 0.0 (to create a pulsing effect).
-    double value = 1.0 -
-                   abs(2.0 * update_reminder_animation_->GetCurrentValue() -
-                       1.0);
+    double value =
+        1.0 - abs(2.0 * update_reminder_animation_->GetCurrentValue() - 1.0);
 
     // Add the badge to it.
     badge = SkBitmapOperations::CreateBlendedBitmap(
         *tp->GetBitmapNamed(IDR_UPGRADE_DOT_INACTIVE),
         *tp->GetBitmapNamed(IDR_UPGRADE_DOT_ACTIVE),
         value);
   }
 
   canvas->DrawBitmapInt(badge, kUpgradeDotOffset,
                         icon.height() - badge.height());
 
   return canvas->ExtractBitmap();
 }
-
-void ToolbarView::ActivateMenuButton(views::MenuButton* menu_button) {
-#if defined(OS_WIN)
-  // On Windows, we have to explicitly clear the focus before opening
-  // the pop-up menu, then set the focus again when it closes.
-  GetFocusManager()->ClearFocus();
-#elif defined(OS_LINUX)
-  // Under GTK, opening a pop-up menu causes the main window to lose focus.
-  // Focus is automatically returned when the menu closes.
-  //
-  // Make sure that the menu button being activated has focus, so that
-  // when the user escapes from the menu without selecting anything, focus
-  // will be returned here.
-  if (!menu_button->HasFocus()) {
-    menu_button->RequestFocus();
-    GetFocusManager()->StoreFocusedView();
-  }
-#endif
-
-  // Tell the menu button to activate, opening its pop-up menu.
-  menu_button->Activate();
-
-#if defined(OS_WIN)
-  SetToolbarFocus(NULL, menu_button);
-#endif
-}