Index: apps/app_window_contents.h |
diff --git a/apps/app_window_contents.h b/apps/app_window_contents.h |
index a8e0d327e75f273dd97905bc40a3c99e6f1952c2..dc3ec8eae01741b4b699636f2273b1e5e3c85a5e 100644 |
--- a/apps/app_window_contents.h |
+++ b/apps/app_window_contents.h |
@@ -5,12 +5,8 @@ |
#ifndef APPS_APP_WINDOW_CONTENTS_H_ |
#define APPS_APP_WINDOW_CONTENTS_H_ |
-#include <vector> |
- |
#include "apps/app_window.h" |
-#include "base/basictypes.h" |
#include "base/memory/scoped_ptr.h" |
-#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/web_contents_observer.h" |
#include "extensions/browser/extension_function_dispatcher.h" |
@@ -31,7 +27,6 @@ namespace apps { |
// messages to the extensions system. |
class AppWindowContentsImpl |
: public AppWindowContents, |
- public content::NotificationObserver, |
public content::WebContentsObserver, |
public extensions::ExtensionFunctionDispatcher::Delegate { |
public: |
@@ -41,18 +36,13 @@ class AppWindowContentsImpl |
// AppWindowContents |
virtual void Initialize(content::BrowserContext* context, |
const GURL& url) OVERRIDE; |
- virtual void LoadContents(int32 creator_process_id) OVERRIDE; |
+ virtual void LoadContents() OVERRIDE; |
virtual void NativeWindowChanged(NativeAppWindow* native_app_window) OVERRIDE; |
virtual void NativeWindowClosed() OVERRIDE; |
virtual void DispatchWindowShownForTests() const OVERRIDE; |
virtual content::WebContents* GetWebContents() const OVERRIDE; |
private: |
- // content::NotificationObserver |
- virtual void Observe(int type, |
- const content::NotificationSource& source, |
- const content::NotificationDetails& details) OVERRIDE; |
- |
// content::WebContentsObserver |
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
@@ -64,11 +54,9 @@ class AppWindowContentsImpl |
void OnRequest(const ExtensionHostMsg_Request_Params& params); |
void UpdateDraggableRegions( |
const std::vector<extensions::DraggableRegion>& regions); |
- void SuspendRenderViewHost(content::RenderViewHost* rvh); |
AppWindow* host_; // This class is owned by |host_| |
GURL url_; |
- content::NotificationRegistrar registrar_; |
scoped_ptr<content::WebContents> web_contents_; |
scoped_ptr<extensions::ExtensionFunctionDispatcher> |
extension_function_dispatcher_; |