Merge Chromium at 7.0.540.0 : Initial merge by git

Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.

Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15

1 files changed, 7 insertions, 0 deletions

diff --git a/chrome/browser/extensions/extension_icon_manager.h b/chrome/browser/extensions/extension_icon_manager.h
index abf7192..876f5e0 100644
--- a/chrome/browser/extensions/extension_icon_manager.h
+++ b/chrome/browser/extensions/extension_icon_manager.h
@@ -4,6 +4,7 @@
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ICON_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ICON_MANAGER_H_
+#pragma once
 
 #include <map>
 #include <set>
@@ -11,6 +12,7 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
+#include "gfx/insets.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class Extension;
@@ -18,6 +20,7 @@ class Extension;
 class ExtensionIconManager : public ImageLoadingTracker::Observer {
  public:
   ExtensionIconManager();
+  virtual ~ExtensionIconManager();
 
   // Start loading the icon for the given extension.
   void LoadIcon(Extension* extension);
@@ -35,6 +38,7 @@ class ExtensionIconManager : public ImageLoadingTracker::Observer {
                              int index);
 
   void set_monochrome(bool value) { monochrome_ = value; }
+  void set_padding(const gfx::Insets& value) { padding_ = value; }
 
  private:
   // Makes sure we've done one-time initialization of the default extension icon
@@ -60,6 +64,9 @@ class ExtensionIconManager : public ImageLoadingTracker::Observer {
   // If true, we will desaturate the icons to make them monochromatic.
   bool monochrome_;
 
+  // Specifies the amount of empty padding to place around the icon.
+  gfx::Insets padding_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionIconManager);
 };