Merge 23055 - Make the theme install infobar have an 'undo' button instead...

chrome/browser/extensions/theme_preview_infobar_delegate.h

Index: chrome/browser/extensions/theme_preview_infobar_delegate.h
===================================================================
--- chrome/browser/extensions/theme_preview_infobar_delegate.h	(revision 23160)
+++ chrome/browser/extensions/theme_preview_infobar_delegate.h	(working copy)
@@ -7,8 +7,6 @@
 
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 
-class Extension;
-class ExtensionsService;
 class SkBitmap;
 class TabContents;
 
@@ -20,7 +18,8 @@
 class ThemePreviewInfobarDelegate : public ConfirmInfoBarDelegate {
  public:
   ThemePreviewInfobarDelegate(TabContents* tab_contents,
-                              const std::string& name);
+                              const std::string& name,
+                              const std::string& previous_theme);
   virtual void InfoBarClosed();
   virtual std::wstring GetMessageText() const;
   virtual SkBitmap* GetIcon() const;
@@ -33,6 +32,7 @@
  private:
   Profile* profile_;
   std::string name_;  // name of theme to install
+  std::string previous_theme_id_;  // used to undo theme install
 };
 
 #endif  // CHROME_BROWSER_VIEWS_EXTENSIONS_THEME_PREVIEW_INFOBAR_DELEGATE_H_
Property changes on: chrome\browser\extensions\theme_preview_infobar_delegate.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/extensions/theme_preview_infobar_delegate.h:r23055