Merge 21719 - Make possible reloading extensions from the chrome://extensions...

chrome/browser/extensions/extensions_ui.h

Index: chrome/browser/extensions/extensions_ui.h
===================================================================
--- chrome/browser/extensions/extensions_ui.h	(revision 22873)
+++ chrome/browser/extensions/extensions_ui.h	(working copy)
@@ -50,7 +50,7 @@
  public:
   explicit ExtensionsDOMHandler(ExtensionsService* extension_service);
   virtual ~ExtensionsDOMHandler();
-  
+
   // DOMMessageHandler implementation.
   virtual void RegisterMessages();
 
@@ -71,6 +71,9 @@
   // Callback for "inspect" message.
   void HandleInspectMessage(const Value* value);
 
+  // Callback for "reload" message.
+  void HandleReloadMessage(const Value* value);
+
   // Callback for "uninstall" message.
   void HandleUninstallMessage(const Value* value);
 
Property changes on: chrome\browser\extensions\extensions_ui.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/browser/extensions/extensions_ui.h:r69-2775
   Merged /trunk/src/chrome/browser/extensions/extensions_ui.h:r21719