Merge 34812 - Add the rightclick context menu for Browser actions and Page...

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
===================================================================
--- chrome/common/extensions/extension.h	(revision 35008)
+++ chrome/common/extensions/extension.h	(working copy)
@@ -177,6 +177,18 @@
   static bool IsPrivilegeIncrease(Extension* old_extension,
                                   Extension* new_extension);
 
+  // Given an extension and icon size, read it if present and decode it into
+  // result.
+  static void DecodeIcon(Extension* extension,
+                         Icons icon_size,
+                         scoped_ptr<SkBitmap>* result);
+
+  // Given an icon_path and icon size, read it if present and decode it into
+  // result.
+  static void DecodeIconFromPath(const FilePath& icon_path,
+                                 Icons icon_size,
+                                 scoped_ptr<SkBitmap>* result);
+
   // Initialize the extension from a parsed manifest.
   // If |require_id| is true, will return an error if the "id" key is missing
   // from the value.