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

chrome/browser/tab_contents/tab_contents.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "build/build_config.h"
 
 #include <map>
@@ skipping 604 matching lines @@
   // Set the time when we started to create the new tab page.  This time is
   // from before we created this TabContents.
   void set_new_tab_start_time(const base::TimeTicks& time) {
     new_tab_start_time_ = time;
   }
 
   // Notification that tab closing has started.  This can be called multiple
   // 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
   // automation purposes.
   friend class AutomationProvider;
   friend class BlockedPopupContainerTest;
   friend class BlockedPopupContainerControllerTest;
 
   FRIEND_TEST(BlockedPopupContainerTest, TestReposition);
   FRIEND_TEST(TabContentsTest, NoJSMessageOnInterstitials);
@@ skipping 321 matching lines @@
   // InitWithExistingID.
   virtual bool CreateRenderViewForRenderManager(
       RenderViewHost* render_view_host);
 
   // NotificationObserver ------------------------------------------------------
 
   virtual void Observe(NotificationType type,
                        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.
   TabContentsDelegate* delegate_;
 
   // Handles the back/forward list and loading.
   NavigationController controller_;
 
   // The corresponding view.
   scoped_ptr<TabContentsView> view_;
@@ skipping 191 matching lines @@
 
   // The time that we started to close the tab.
   base::TimeTicks tab_close_start_time_;
 
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_