Chromium Code Reviews| Index: content/shell/browser/shell.h |
| diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h |
| index 370720261da8764c753ed2d517c467e4c2d92d16..ecbbdc9286d1845f77da7138aa0a99524893274b 100644 |
| --- a/content/shell/browser/shell.h |
| +++ b/content/shell/browser/shell.h |
| @@ -25,6 +25,9 @@ typedef struct _GtkToolItem GtkToolItem; |
| #elif defined(OS_ANDROID) |
| #include "base/android/scoped_java_ref.h" |
| #elif defined(USE_AURA) |
| +namespace aura { |
| +class RootWindow; |
| +} |
| #if defined(OS_CHROMEOS) |
| namespace shell { |
| class MinimalShell; |
| @@ -259,9 +262,13 @@ class Shell : public WebContentsDelegate, |
| #if defined(OS_CHROMEOS) |
| static shell::MinimalShell* minimal_shell_; |
| #endif |
| +#if defined(TOOLKIT_VIEWS) |
| static views::ViewsDelegate* views_delegate_; |
| views::Widget* window_widget_; |
| +#else // defined(TOOLKIT_VIEWS) |
| + static scoped_ptr<aura::RootWindow> root_window_; |
|
Daniel Erat
2013/10/17 14:41:19
should this be a regular pointer instead?
|
| +#endif // defined(TOOLKIT_VIEWS) |
| #elif defined(OS_MACOSX) |
| int content_width_; |
| int content_height_; |