summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sidebar
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 22:42:51 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 22:42:51 +0000
commit9814a5bd63977bd7395a1dab0704c263db9cfd24 (patch)
tree420f30e77441e08f16e8b6e562f3b16114fda803 /chrome/browser/sidebar
parentd67f5ae4b15488d401f9fa20abb7557a3c09a080 (diff)
downloadchromium_src-9814a5bd63977bd7395a1dab0704c263db9cfd24.zip
chromium_src-9814a5bd63977bd7395a1dab0704c263db9cfd24.tar.gz
chromium_src-9814a5bd63977bd7395a1dab0704c263db9cfd24.tar.bz2
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
Diffstat (limited to 'chrome/browser/sidebar')
-rw-r--r--chrome/browser/sidebar/sidebar_container.cc4
-rw-r--r--chrome/browser/sidebar/sidebar_container.h13
2 files changed, 6 insertions, 11 deletions
diff --git a/chrome/browser/sidebar/sidebar_container.cc b/chrome/browser/sidebar/sidebar_container.cc
index f219d65..d428971 100644
--- a/chrome/browser/sidebar/sidebar_container.cc
+++ b/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();
diff --git a/chrome/browser/sidebar/sidebar_container.h b/chrome/browser/sidebar/sidebar_container.h
index e4ab45c..4fee1cc 100644
--- a/chrome/browser/sidebar/sidebar_container.h
+++ b/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;