summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tab_helper.h
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 01:19:56 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 01:19:56 +0000
commit9fbfb8c857ffdad94b4438bc20f8e349fa06b6ec (patch)
tree22a3792903afc467e9337ec7ff23086002aa2a22 /chrome/browser/extensions/extension_tab_helper.h
parent8d990d54368990f0cc12ffabde1fc19fccb2c4c4 (diff)
downloadchromium_src-9fbfb8c857ffdad94b4438bc20f8e349fa06b6ec.zip
chromium_src-9fbfb8c857ffdad94b4438bc20f8e349fa06b6ec.tar.gz
chromium_src-9fbfb8c857ffdad94b4438bc20f8e349fa06b6ec.tar.bz2
Revert 104410 - Add js api for hosted/packaged apps to request notification authorization
BUG=98145 TEST=None (more pieces will be landing that will make it testable) Review URL: http://codereview.chromium.org/8113006 TBR=asargent@chromium.org Review URL: http://codereview.chromium.org/8188004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tab_helper.h')
-rw-r--r--chrome/browser/extensions/extension_tab_helper.h23
1 files changed, 5 insertions, 18 deletions
diff --git a/chrome/browser/extensions/extension_tab_helper.h b/chrome/browser/extensions/extension_tab_helper.h
index 9e77970..7dda6ff 100644
--- a/chrome/browser/extensions/extension_tab_helper.h
+++ b/chrome/browser/extensions/extension_tab_helper.h
@@ -6,13 +6,11 @@
#define CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_HELPER_H_
#pragma once
-#include "base/memory/weak_ptr.h"
-#include "chrome/browser/extensions/app_notify_channel_setup.h"
+#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 "content/browser/tab_contents/tab_contents_observer.h"
#include "third_party/skia/include/core/SkBitmap.h"
class Extension;
@@ -24,13 +22,10 @@ struct LoadCommittedDetails;
}
// Per-tab extension helper. Also handles non-extension apps.
-class ExtensionTabHelper
- : public TabContentsObserver,
- public ExtensionFunctionDispatcher::Delegate,
- public ImageLoadingTracker::Observer,
- public WebstoreInlineInstaller::Delegate,
- public AppNotifyChannelSetup::Delegate,
- public base::SupportsWeakPtr<ExtensionTabHelper> {
+class ExtensionTabHelper : public TabContentsObserver,
+ public ExtensionFunctionDispatcher::Delegate,
+ public ImageLoadingTracker::Observer,
+ public WebstoreInlineInstaller::Delegate {
public:
explicit ExtensionTabHelper(TabContentsWrapper* wrapper);
virtual ~ExtensionTabHelper();
@@ -105,9 +100,6 @@ class ExtensionTabHelper
void OnInlineWebstoreInstall(int install_id,
const std::string& webstore_item_id,
const GURL& requestor_url);
- void OnGetAppNotifyChannel(int request_id,
- const GURL& requestor_url,
- const std::string& client_id);
void OnRequest(const ExtensionHostMsg_Request_Params& params);
// App extensions related methods:
@@ -125,11 +117,6 @@ class ExtensionTabHelper
virtual void OnInlineInstallFailure(int install_id,
const std::string& error) OVERRIDE;
- // AppNotifyChannelSetup::Delegate.
- virtual void AppNotifyChannelSetupComplete(int request_id,
- const std::string& channel_id,
- const std::string& error);
-
// Data for app extensions ---------------------------------------------------
// If non-null this tab is an app tab and this is the extension the tab was