Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1835)

Unified Diff: chrome/browser/extensions/tab_helper.h

Issue 12680004: Remove chrome/ code to handle App Notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/tab_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/tab_helper.h
diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h
index e0cc90087ecc5c8593f5143c20e7a4380d79c7fb..14e46f2126216db5c4f176e185af6d49da6884f1 100644
--- a/chrome/browser/extensions/tab_helper.h
+++ b/chrome/browser/extensions/tab_helper.h
@@ -13,7 +13,6 @@
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "chrome/browser/extensions/active_tab_permission_granter.h"
-#include "chrome/browser/extensions/app_notify_channel_setup.h"
#include "chrome/browser/extensions/extension_function_dispatcher.h"
#include "chrome/common/web_apps.h"
#include "content/public/browser/notification_observer.h"
@@ -43,7 +42,6 @@ class ScriptExecutor;
// Per-tab extension helper. Also handles non-extension apps.
class TabHelper : public content::WebContentsObserver,
public ExtensionFunctionDispatcher::Delegate,
- public AppNotifyChannelSetup::Delegate,
public base::SupportsWeakPtr<TabHelper>,
public content::NotificationObserver,
public content::WebContentsUserData<TabHelper> {
@@ -186,10 +184,6 @@ class TabHelper : public content::WebContentsObserver,
int return_route_id,
const std::string& webstore_item_id,
const GURL& requestor_url);
- void OnGetAppNotifyChannel(const GURL& requestor_url,
- const std::string& client_id,
- int return_route_id,
- int callback_id);
void OnGetAppInstallState(const GURL& requestor_url,
int return_route_id,
int callback_id);
@@ -216,12 +210,6 @@ class TabHelper : public content::WebContentsObserver,
bool success,
const std::string& error);
- // AppNotifyChannelSetup::Delegate.
- virtual void AppNotifyChannelSetupComplete(
- const std::string& channel_id,
- const std::string& error,
- const AppNotifyChannelSetup* setup) OVERRIDE;
-
// content::NotificationObserver.
virtual void Observe(int type,
const content::NotificationSource& source,
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698