| Index: chrome/browser/sidebar/sidebar_container.h
|
| diff --git a/chrome/browser/sidebar/sidebar_container.h b/chrome/browser/sidebar/sidebar_container.h
|
| index f368a73608eb96a07a2daadaf627683671c05b11..04b5d8611f1fd2adec2e72614da38a2185e636ba 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"
|
| @@ -25,9 +26,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 {
|
| @@ -93,15 +93,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;
|
|
|