Index: content/shell/browser/shell.h |
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h |
index 370720261da8764c753ed2d517c467e4c2d92d16..ba3674972b3c4a9c6353eaf48b93d37881bc271d 100644 |
--- a/content/shell/browser/shell.h |
+++ b/content/shell/browser/shell.h |
@@ -11,6 +11,7 @@ |
#include "base/callback_forward.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/strings/string_piece.h" |
+#include "build/build_config.h" |
#include "content/public/browser/web_contents_delegate.h" |
#include "content/public/browser/web_contents_observer.h" |
#include "ipc/ipc_channel.h" |
@@ -39,6 +40,10 @@ class ViewsDelegate; |
class GURL; |
namespace content { |
+#if defined(USE_AURA) |
+class ShellAuraPlatformData; |
+#endif |
+ |
class BrowserContext; |
class ShellDevToolsFrontend; |
class ShellJavaScriptDialogManager; |
@@ -259,9 +264,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) |
+ scoped_ptr<ShellAuraPlatformData> platform_; |
+#endif // defined(TOOLKIT_VIEWS) |
#elif defined(OS_MACOSX) |
int content_width_; |
int content_height_; |