OLD | NEW |
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 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "chrome/browser/extensions/extension_function_dispatcher.h" | 9 #include "chrome/browser/extensions/extension_function_dispatcher.h" |
10 #include "chrome/browser/sessions/session_id.h" | 10 #include "chrome/browser/sessions/session_id.h" |
11 #include "chrome/browser/ui/base_window.h" | 11 #include "chrome/browser/ui/base_window.h" |
12 #include "content/public/browser/notification_observer.h" | 12 #include "content/public/browser/notification_observer.h" |
13 #include "content/public/browser/notification_registrar.h" | 13 #include "content/public/browser/notification_registrar.h" |
14 #include "content/public/browser/web_contents_delegate.h" | 14 #include "content/public/browser/web_contents_delegate.h" |
15 #include "content/public/browser/web_contents_observer.h" | 15 #include "content/public/browser/web_contents_observer.h" |
16 #include "content/public/common/console_message_level.h" | 16 #include "content/public/common/console_message_level.h" |
17 #include "ui/gfx/rect.h" | 17 #include "ui/gfx/rect.h" |
18 | 18 |
19 class GURL; | 19 class GURL; |
20 class Profile; | 20 class Profile; |
21 class TabContents; | 21 class TabContents; |
22 class NativeShellWindow; | 22 class NativeShellWindow; |
| 23 class ExternalWebContentImpl; |
23 | 24 |
24 namespace content { | 25 namespace content { |
25 class WebContents; | 26 class WebContents; |
26 } | 27 } |
27 | 28 |
28 namespace extensions { | 29 namespace extensions { |
29 class Extension; | 30 class Extension; |
30 class PlatformAppBrowserTest; | 31 class PlatformAppBrowserTest; |
31 class WindowController; | 32 class WindowController; |
32 | 33 |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 // window. | 169 // window. |
169 std::string window_key_; | 170 std::string window_key_; |
170 | 171 |
171 const SessionID session_id_; | 172 const SessionID session_id_; |
172 scoped_ptr<TabContents> contents_; | 173 scoped_ptr<TabContents> contents_; |
173 // web_contents_ is owned by contents_. | 174 // web_contents_ is owned by contents_. |
174 content::WebContents* web_contents_; | 175 content::WebContents* web_contents_; |
175 content::NotificationRegistrar registrar_; | 176 content::NotificationRegistrar registrar_; |
176 ExtensionFunctionDispatcher extension_function_dispatcher_; | 177 ExtensionFunctionDispatcher extension_function_dispatcher_; |
177 | 178 |
| 179 // Web content delegate for link navigation. |
| 180 scoped_ptr<ExternalWebContentImpl> external_content_delegate_; |
| 181 |
178 scoped_ptr<NativeShellWindow> native_window_; | 182 scoped_ptr<NativeShellWindow> native_window_; |
179 | 183 |
180 DISALLOW_COPY_AND_ASSIGN(ShellWindow); | 184 DISALLOW_COPY_AND_ASSIGN(ShellWindow); |
181 }; | 185 }; |
182 | 186 |
183 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ | 187 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ |
OLD | NEW |