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

Side by Side Diff: trunk/src/apps/app_window_contents.h

Issue 163913004: Revert 250826 "Remove Profile dependency from apps::ShellWindow" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 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
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 CHROME_BROWSER_EXTENSIONS_APP_WINDOW_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_APP_WINDOW_CONTENTS_H_
6 #define CHROME_BROWSER_EXTENSIONS_APP_WINDOW_CONTENTS_H_ 6 #define CHROME_BROWSER_EXTENSIONS_APP_WINDOW_CONTENTS_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/shell_window.h" 10 #include "apps/shell_window.h"
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "chrome/browser/extensions/extension_function_dispatcher.h" 13 #include "chrome/browser/extensions/extension_function_dispatcher.h"
14 #include "content/public/browser/notification_observer.h" 14 #include "content/public/browser/notification_observer.h"
15 #include "content/public/browser/web_contents_observer.h" 15 #include "content/public/browser/web_contents_observer.h"
16 16
17 class GURL; 17 class GURL;
18 18
19 namespace content { 19 namespace content {
20 class BrowserContext; 20 class RenderViewHost;
21 } 21 }
22 22
23 namespace extensions { 23 namespace extensions {
24 struct DraggableRegion; 24 struct DraggableRegion;
25 } 25 }
26 26
27 namespace apps { 27 namespace apps {
28 28
29 // ShellWindowContents class specific to app windows. It maintains a 29 // ShellWindowContents class specific to app windows. It maintains a
30 // WebContents instance and observes it for the purpose of passing 30 // WebContents instance and observes it for the purpose of passing
31 // messages to the extensions system. 31 // messages to the extensions system.
32 class AppWindowContents : public ShellWindowContents, 32 class AppWindowContents : public ShellWindowContents,
33 public content::NotificationObserver, 33 public content::NotificationObserver,
34 public content::WebContentsObserver, 34 public content::WebContentsObserver,
35 public ExtensionFunctionDispatcher::Delegate { 35 public ExtensionFunctionDispatcher::Delegate {
36 public: 36 public:
37 explicit AppWindowContents(ShellWindow* host); 37 explicit AppWindowContents(ShellWindow* host);
38 virtual ~AppWindowContents(); 38 virtual ~AppWindowContents();
39 39
40 // ShellWindowContents 40 // ShellWindowContents
41 virtual void Initialize(content::BrowserContext* context, 41 virtual void Initialize(Profile* profile, const GURL& url) OVERRIDE;
42 const GURL& url) OVERRIDE;
43 virtual void LoadContents(int32 creator_process_id) OVERRIDE; 42 virtual void LoadContents(int32 creator_process_id) OVERRIDE;
44 virtual void NativeWindowChanged(NativeAppWindow* native_app_window) OVERRIDE; 43 virtual void NativeWindowChanged(NativeAppWindow* native_app_window) OVERRIDE;
45 virtual void NativeWindowClosed() OVERRIDE; 44 virtual void NativeWindowClosed() OVERRIDE;
46 virtual content::WebContents* GetWebContents() const OVERRIDE; 45 virtual content::WebContents* GetWebContents() const OVERRIDE;
47 46
48 private: 47 private:
49 // content::NotificationObserver 48 // content::NotificationObserver
50 virtual void Observe(int type, 49 virtual void Observe(int type,
51 const content::NotificationSource& source, 50 const content::NotificationSource& source,
52 const content::NotificationDetails& details) OVERRIDE; 51 const content::NotificationDetails& details) OVERRIDE;
(...skipping 16 matching lines...) Expand all
69 content::NotificationRegistrar registrar_; 68 content::NotificationRegistrar registrar_;
70 scoped_ptr<content::WebContents> web_contents_; 69 scoped_ptr<content::WebContents> web_contents_;
71 scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_; 70 scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_;
72 71
73 DISALLOW_COPY_AND_ASSIGN(AppWindowContents); 72 DISALLOW_COPY_AND_ASSIGN(AppWindowContents);
74 }; 73 };
75 74
76 } // namespace apps 75 } // namespace apps
77 76
78 #endif // CHROME_BROWSER_EXTENSIONS_APP_WINDOW_CONTENTS_H_ 77 #endif // CHROME_BROWSER_EXTENSIONS_APP_WINDOW_CONTENTS_H_
OLDNEW
« no previous file with comments | « trunk/src/apps/app_shim/extension_app_shim_handler_mac.cc ('k') | trunk/src/apps/app_window_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698