Fix the remaining cases of classes implementing non-existent TabContentsDelegate::IsPopup().

BUG=100276
R=thestig@chromium.org

Review URL: http://codereview.chromium.org/8513023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110581 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/sidebar/sidebar_container.cc

@@ -106,10 +106,6 @@ void SidebarContainer::SetTitle(const string16& title) {
   title_ = title;
 }
 
-bool SidebarContainer::IsPopup(const TabContents* source) const {
-  return false;
-}
-
 content::JavaScriptDialogCreator*
 SidebarContainer::GetJavaScriptDialogCreator() {
   return GetJavaScriptDialogCreatorInstance();

chrome/browser/sidebar/sidebar_container.h

@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
@@ -22,9 +23,8 @@ class TabContents;
 //  Stores one particular sidebar state: sidebar's content, its content id,
 //  tab it is linked to, mini tab icon, title etc.
 //
-class SidebarContainer
-    : public TabContentsDelegate,
-      private ImageLoadingTracker::Observer {
+class SidebarContainer : public TabContentsDelegate,
+                         private ImageLoadingTracker::Observer {
  public:
   // Interface to implement to listen for sidebar update notification.
   class Delegate {
@@ -90,15 +90,14 @@ class SidebarContainer
   void SetTitle(const string16& title);
 
  private:
-  // Overridden from TabContentsDelegate.
-  virtual bool IsPopup(const TabContents* source) const;
+  // Overridden from TabContentsDelegate:
   virtual content::JavaScriptDialogCreator*
       GetJavaScriptDialogCreator() OVERRIDE;
 
-  // Overridden from ImageLoadingTracker::Observer.
+  // Overridden from ImageLoadingTracker::Observer:
   virtual void OnImageLoaded(SkBitmap* image,
                              const ExtensionResource& resource,
-                             int index);
+                             int index) OVERRIDE;
 
   // Returns an extension this sidebar belongs to.
   const Extension* GetExtension() const;

chrome/browser/ui/blocked_content/blocked_content_container.cc

@@ -161,7 +161,7 @@ void BlockedContentContainer::MoveContents(TabContents* source,
   }
 }
 
-bool BlockedContentContainer::IsPopup(const TabContents* source) const {
+bool BlockedContentContainer::IsPopupOrPanel(const TabContents* source) const {
   // Assume everything added is a popup. This may turn out to be wrong, but
   // callers don't cache this information so it should be fine if the value ends
   // up changing.

chrome/browser/ui/blocked_content/blocked_content_container.h

@@ -80,8 +80,7 @@ class BlockedContentContainer : public BlockedContentTabHelperDelegate,
   // Changes the opening rectangle associated with |source|.
   virtual void MoveContents(TabContents* source, const gfx::Rect& new_bounds);
 
-  // Always returns true.
-  virtual bool IsPopup(const TabContents* source) const;
+  virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE;
 
   // Always returns true.
   virtual bool ShouldSuppressDialogs();

chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc

@@ -223,10 +223,6 @@ void DraggedTabControllerGtk::LoadingStateChanged(TabContents* source) {
     dragged_view_->Update();
 }
 
-bool DraggedTabControllerGtk::IsPopup(const TabContents* source) const {
-  return false;
-}
-
 content::JavaScriptDialogCreator*
 DraggedTabControllerGtk::GetJavaScriptDialogCreator() {
   return GetJavaScriptDialogCreatorInstance();

chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h

@@ -11,6 +11,8 @@
 #include <set>
 #include <vector>
 
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/ui/gtk/tabs/drag_data.h"
@@ -94,14 +96,13 @@ class DraggedTabControllerGtk : public content::NotificationObserver,
   virtual TabContents* OpenURLFromTab(TabContents* source,
                                       const OpenURLParams& params) OVERRIDE;
   virtual void NavigationStateChanged(const TabContents* source,
-                                      unsigned changed_flags);
+                                      unsigned changed_flags) OVERRIDE;
   virtual void AddNewContents(TabContents* source,
                               TabContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
-                              bool user_gesture);
-  virtual void LoadingStateChanged(TabContents* source);
-  virtual bool IsPopup(const TabContents* source) const;
+                              bool user_gesture) OVERRIDE;
+  virtual void LoadingStateChanged(TabContents* source) OVERRIDE;
   virtual content::JavaScriptDialogCreator*
       GetJavaScriptDialogCreator() OVERRIDE;