| Index: chrome/browser/extensions/extension_tab_helper.h
|
| diff --git a/chrome/browser/extensions/extension_tab_helper.h b/chrome/browser/extensions/extension_tab_helper.h
|
| index b5f16848cb86206244660f11c8deaedc7ac9c2c9..a3324af1f4fac4f22a82e09da39475d621f9074e 100644
|
| --- a/chrome/browser/extensions/extension_tab_helper.h
|
| +++ b/chrome/browser/extensions/extension_tab_helper.h
|
| @@ -9,6 +9,7 @@
|
| #include "content/browser/tab_contents/tab_contents_observer.h"
|
| #include "chrome/browser/extensions/extension_function_dispatcher.h"
|
| #include "chrome/browser/extensions/image_loading_tracker.h"
|
| +#include "chrome/browser/extensions/webstore_inline_installer.h"
|
| #include "chrome/common/web_apps.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
|
|
| @@ -23,7 +24,8 @@ struct LoadCommittedDetails;
|
| // Per-tab extension helper. Also handles non-extension apps.
|
| class ExtensionTabHelper : public TabContentsObserver,
|
| public ExtensionFunctionDispatcher::Delegate,
|
| - public ImageLoadingTracker::Observer {
|
| + public ImageLoadingTracker::Observer,
|
| + public WebstoreInlineInstaller::Delegate {
|
| public:
|
| explicit ExtensionTabHelper(TabContentsWrapper* wrapper);
|
| virtual ~ExtensionTabHelper();
|
| @@ -85,13 +87,13 @@ class ExtensionTabHelper : public TabContentsObserver,
|
| virtual void DidNavigateMainFramePostCommit(
|
| const content::LoadCommittedDetails& details,
|
| const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
|
| - virtual bool OnMessageReceived(const IPC::Message& message);
|
| + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
|
|
| // ExtensionFunctionDispatcher::Delegate overrides.
|
| - virtual Browser* GetBrowser();
|
| - virtual gfx::NativeView GetNativeViewOfHost();
|
| - virtual gfx::NativeWindow GetCustomFrameNativeWindow();
|
| - virtual TabContents* GetAssociatedTabContents() const;
|
| + virtual Browser* GetBrowser() OVERRIDE;
|
| + virtual gfx::NativeView GetNativeViewOfHost() OVERRIDE;
|
| + virtual gfx::NativeWindow GetCustomFrameNativeWindow() OVERRIDE;
|
| + virtual TabContents* GetAssociatedTabContents() const OVERRIDE;
|
|
|
| // Message handlers.
|
| void OnDidGetApplicationInfo(int32 page_id, const WebApplicationInfo& info);
|
| @@ -107,7 +109,11 @@ class ExtensionTabHelper : public TabContentsObserver,
|
|
|
| // ImageLoadingTracker::Observer.
|
| virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
|
| - int index);
|
| + int index) OVERRIDE;
|
| +
|
| + // WebstoreInlineInstaller::Delegate.
|
| + virtual void OnInlineInstallSuccess() OVERRIDE;
|
| + virtual void OnInlineInstallFailure(const std::string& error) OVERRIDE;
|
|
|
| // Data for app extensions ---------------------------------------------------
|
|
|
|
|