Update browserAction.setIcon and pageAction.setIcon for hidpi

chrome/browser/ui/views/browser_action_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BROWSER_ACTION_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTION_VIEW_H_
 
 #include <string>
 
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "content/public/browser/notification_observer.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/drag_controller.h"
 #include "ui/views/view.h"
 
 class Browser;
 class BrowserActionButton;
 class ExtensionAction;
 
 namespace extensions {
 class Extension;
 }
 
+namespace gfx {
+class Image;
+}
+
 namespace views {
 class MenuItemView;
 class MenuRunner;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionView
 // A single entry in the browser action container. This contains the actual
 // BrowserActionButton, as well as the logic to paint the badge.
 class BrowserActionView : public views::View {
@@ skipping 124 matching lines @@
   // Notifications when to set button state to pushed/not pushed (for when the
   // popup/context menu is hidden or shown by the container).
   void SetButtonPushed();
   void SetButtonNotPushed();
 
   // Whether the browser action is enabled on this tab. Note that we cannot use
   // the built-in views enabled/SetEnabled because disabled views do not
   // receive drag events.
   bool IsEnabled(int tab_id) const;
 
+  // Returns button icon so it can be accessed during tests.
+  gfx::ImageSkia GetIconForTest();
+
  protected:
   // Overridden from views::View:
   virtual void ViewHierarchyChanged(bool is_add,
                                     View* parent,
                                     View* child) OVERRIDE;
 
  private:
   virtual ~BrowserActionButton();
 
   // Register an extension command if the extension has an active one.
@@ skipping 39 matching lines @@
 
   // Responsible for running the menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   friend class base::DeleteHelper<BrowserActionButton>;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTION_VIEW_H_