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

Side by Side Diff: chrome/browser/ui/extensions/shell_window.h

Issue 10536093: TabContentsWrapper -> TabContents, part 39. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_UI_EXTENSIONS_SHELL_WINDOW_H_ 5 #ifndef CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/extensions/extension_function_dispatcher.h" 10 #include "chrome/browser/extensions/extension_function_dispatcher.h"
11 #include "chrome/browser/sessions/session_id.h" 11 #include "chrome/browser/sessions/session_id.h"
12 #include "chrome/browser/ui/base_window.h" 12 #include "chrome/browser/ui/base_window.h"
13 #include "content/public/browser/notification_observer.h" 13 #include "content/public/browser/notification_observer.h"
14 #include "content/public/browser/notification_registrar.h" 14 #include "content/public/browser/notification_registrar.h"
15 #include "content/public/browser/web_contents_delegate.h" 15 #include "content/public/browser/web_contents_delegate.h"
16 #include "content/public/browser/web_contents_observer.h" 16 #include "content/public/browser/web_contents_observer.h"
17 #include "ui/gfx/rect.h" 17 #include "ui/gfx/rect.h"
18 18
19 class ExtensionWindowController; 19 class ExtensionWindowController;
20 class GURL; 20 class GURL;
21 class Profile; 21 class Profile;
22 class TabContents; 22 class TabContents;
23 typedef TabContents TabContentsWrapper;
24 23
25 namespace content { 24 namespace content {
26 class WebContents; 25 class WebContents;
27 } 26 }
28 27
29 namespace extensions { 28 namespace extensions {
30 class Extension; 29 class Extension;
31 } 30 }
32 31
33 // ShellWindow is the type of window used by platform apps. Shell windows 32 // ShellWindow is the type of window used by platform apps. Shell windows
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 OVERRIDE; 120 OVERRIDE;
122 121
123 // Message handlers. 122 // Message handlers.
124 void OnRequest(const ExtensionHostMsg_Request_Params& params); 123 void OnRequest(const ExtensionHostMsg_Request_Params& params);
125 124
126 Profile* profile_; // weak pointer - owned by ProfileManager. 125 Profile* profile_; // weak pointer - owned by ProfileManager.
127 // weak pointer - owned by ExtensionService. 126 // weak pointer - owned by ExtensionService.
128 const extensions::Extension* extension_; 127 const extensions::Extension* extension_;
129 128
130 const SessionID session_id_; 129 const SessionID session_id_;
131 scoped_ptr<TabContentsWrapper> contents_wrapper_; 130 scoped_ptr<TabContents> contents_;
132 // web_contents_ is owned by contents_wrapper_. 131 // web_contents_ is owned by contents_.
133 content::WebContents* web_contents_; 132 content::WebContents* web_contents_;
134 content::NotificationRegistrar registrar_; 133 content::NotificationRegistrar registrar_;
135 ExtensionFunctionDispatcher extension_function_dispatcher_; 134 ExtensionFunctionDispatcher extension_function_dispatcher_;
136 135
137 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 136 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
138 }; 137 };
139 138
140 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 139 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/extensions/application_launch.cc ('k') | chrome/browser/ui/extensions/shell_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698