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

Side by Side Diff: apps/app_window_contents.h

Issue 378193002: AppWindowContents: Clean up unnecessary SuspendRenderViewHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert initial suspension of resource requests on app window open. Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | apps/app_window_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef APPS_APP_WINDOW_CONTENTS_H_ 5 #ifndef APPS_APP_WINDOW_CONTENTS_H_
6 #define APPS_APP_WINDOW_CONTENTS_H_ 6 #define APPS_APP_WINDOW_CONTENTS_H_
7 7
8 #include <vector>
9
10 #include "apps/app_window.h" 8 #include "apps/app_window.h"
11 #include "base/basictypes.h" 9 #include "base/basictypes.h"
12 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
13 #include "content/public/browser/notification_observer.h" 11 #include "content/public/browser/notification_observer.h"
14 #include "content/public/browser/web_contents_observer.h" 12 #include "content/public/browser/web_contents_observer.h"
15 #include "extensions/browser/extension_function_dispatcher.h" 13 #include "extensions/browser/extension_function_dispatcher.h"
16 14 #include "url/gurl.h"
17 class GURL;
18 15
19 namespace content { 16 namespace content {
20 class BrowserContext; 17 class BrowserContext;
21 } 18 }
22 19
23 namespace extensions { 20 namespace extensions {
24 struct DraggableRegion; 21 struct DraggableRegion;
25 } 22 }
26 23
27 namespace apps { 24 namespace apps {
28 25
29 // AppWindowContents class specific to app windows. It maintains a 26 // AppWindowContents class specific to app windows. It maintains a
30 // WebContents instance and observes it for the purpose of passing 27 // WebContents instance and observes it for the purpose of passing
31 // messages to the extensions system. 28 // messages to the extensions system.
32 class AppWindowContentsImpl 29 class AppWindowContentsImpl
33 : public AppWindowContents, 30 : public AppWindowContents,
34 public content::NotificationObserver,
35 public content::WebContentsObserver, 31 public content::WebContentsObserver,
36 public extensions::ExtensionFunctionDispatcher::Delegate { 32 public extensions::ExtensionFunctionDispatcher::Delegate {
37 public: 33 public:
38 explicit AppWindowContentsImpl(AppWindow* host); 34 explicit AppWindowContentsImpl(AppWindow* host);
39 virtual ~AppWindowContentsImpl(); 35 virtual ~AppWindowContentsImpl();
40 36
41 // AppWindowContents 37 // AppWindowContents
42 virtual void Initialize(content::BrowserContext* context, 38 virtual void Initialize(content::BrowserContext* context,
43 const GURL& url) OVERRIDE; 39 const GURL& url) OVERRIDE;
44 virtual void LoadContents(int32 creator_process_id) OVERRIDE; 40 virtual void LoadContents(int32 creator_process_id) OVERRIDE;
45 virtual void NativeWindowChanged(NativeAppWindow* native_app_window) OVERRIDE; 41 virtual void NativeWindowChanged(NativeAppWindow* native_app_window) OVERRIDE;
46 virtual void NativeWindowClosed() OVERRIDE; 42 virtual void NativeWindowClosed() OVERRIDE;
47 virtual void DispatchWindowShownForTests() const OVERRIDE; 43 virtual void DispatchWindowShownForTests() const OVERRIDE;
48 virtual content::WebContents* GetWebContents() const OVERRIDE; 44 virtual content::WebContents* GetWebContents() const OVERRIDE;
49 45
50 private: 46 private:
51 // content::NotificationObserver
52 virtual void Observe(int type,
53 const content::NotificationSource& source,
54 const content::NotificationDetails& details) OVERRIDE;
55
56 // content::WebContentsObserver 47 // content::WebContentsObserver
57 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 48 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
58 49
59 // extensions::ExtensionFunctionDispatcher::Delegate 50 // extensions::ExtensionFunctionDispatcher::Delegate
60 virtual extensions::WindowController* GetExtensionWindowController() const 51 virtual extensions::WindowController* GetExtensionWindowController() const
61 OVERRIDE; 52 OVERRIDE;
62 virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE; 53 virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
63 54
64 void OnRequest(const ExtensionHostMsg_Request_Params& params); 55 void OnRequest(const ExtensionHostMsg_Request_Params& params);
65 void UpdateDraggableRegions( 56 void UpdateDraggableRegions(
66 const std::vector<extensions::DraggableRegion>& regions); 57 const std::vector<extensions::DraggableRegion>& regions);
67 void SuspendRenderViewHost(content::RenderViewHost* rvh); 58 void SuspendRenderViewHost(content::RenderViewHost* rvh);
68 59
69 AppWindow* host_; // This class is owned by |host_| 60 AppWindow* host_; // This class is owned by |host_|
70 GURL url_; 61 GURL url_;
71 content::NotificationRegistrar registrar_;
72 scoped_ptr<content::WebContents> web_contents_; 62 scoped_ptr<content::WebContents> web_contents_;
73 scoped_ptr<extensions::ExtensionFunctionDispatcher> 63 scoped_ptr<extensions::ExtensionFunctionDispatcher>
74 extension_function_dispatcher_; 64 extension_function_dispatcher_;
75 65
76 DISALLOW_COPY_AND_ASSIGN(AppWindowContentsImpl); 66 DISALLOW_COPY_AND_ASSIGN(AppWindowContentsImpl);
77 }; 67 };
78 68
79 } // namespace apps 69 } // namespace apps
80 70
81 #endif // APPS_APP_WINDOW_CONTENTS_H_ 71 #endif // APPS_APP_WINDOW_CONTENTS_H_
OLDNEW
« no previous file with comments | « no previous file | apps/app_window_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698