Merge 32889 - Fix crash when an extension popup shows a JS alert. Showing the...

chrome/browser/tab_contents/tab_contents.h

Index: chrome/browser/tab_contents/tab_contents.h
===================================================================
--- chrome/browser/tab_contents/tab_contents.h	(revision 32899)
+++ chrome/browser/tab_contents/tab_contents.h	(working copy)
@@ -622,6 +622,17 @@
   // times, subsequent calls are ignored.
   void OnCloseStarted();
 
+  // JavaScriptMessageBoxClient ------------------------------------------------
+  virtual std::wstring GetMessageBoxTitle(const GURL& frame_url,
+                                          bool is_alert);
+  virtual gfx::NativeWindow GetMessageBoxRootWindow();
+  virtual void OnMessageBoxClosed(IPC::Message* reply_msg,
+                                  bool success,
+                                  const std::wstring& prompt);
+  virtual void SetSuppressMessageBoxes(bool suppress_message_boxes);
+  virtual TabContents* AsTabContents() { return this; }
+  virtual ExtensionHost* AsExtensionHost() { return NULL; }
+
  private:
   friend class NavigationController;
   // Used to access the child_windows_ (ConstrainedWindowList) for testing
@@ -963,17 +974,6 @@
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-
-  // JavaScriptMessageBoxClient ------------------------------------------------
-  virtual std::wstring GetMessageBoxTitle(const GURL& frame_url,
-                                          bool is_alert);
-  virtual gfx::NativeWindow GetMessageBoxRootWindow();
-  virtual void OnMessageBoxClosed(IPC::Message* reply_msg,
-                                  bool success,
-                                  const std::wstring& prompt);
-  virtual void SetSuppressMessageBoxes(bool suppress_message_boxes);
-  virtual TabContents* AsTabContents() { return this; }
-
   // Data for core operation ---------------------------------------------------
 
   // Delegate for notifying our owner about stuff. Not owned by us.
Property changes on: chrome\browser\tab_contents\tab_contents.h
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/chrome/browser/tab_contents.h:r69-2775