Revert 229521 "Revert 229507 "aura: Allow creating content_shell..."

trunk/src/content/shell/browser/shell.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_
 #define CONTENT_SHELL_BROWSER_SHELL_H_
 
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 21 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 namespace views {
 class Widget;
 class ViewsDelegate;
 }  // namespace views
 #endif  // defined(USE_AURA)
 
 class GURL;
 namespace content {
 
+#if defined(USE_AURA)
+class ShellAuraPlatformData;
+#endif
+
 class BrowserContext;
 class ShellDevToolsFrontend;
 class ShellJavaScriptDialogManager;
 class SiteInstance;
 class WebContents;
 
 // This represents one window of the Content Shell, i.e. all the UI including
 // buttons and url bar, as well as the web content area.
 class Shell : public WebContentsDelegate,
               public WebContentsObserver {
@@ skipping 200 matching lines @@
 
   int content_width_;
   int content_height_;
   int ui_elements_height_; // height of menubar, toolbar, etc.
 #elif defined(OS_ANDROID)
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
 #elif defined(USE_AURA)
 #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_;
 #endif
 
   bool headless_;
 
   // A container of all the open windows. We use a vector so we can keep track
   // of ordering.
   static std::vector<Shell*> windows_;
 
   static base::Callback<void(Shell*)> shell_created_callback_;
 
   // True if the destructur of Shell should post a quit closure on the current
   // message loop if the destructed Shell object was the last one.
   static bool quit_message_loop_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_SHELL_H_