Make Chrome limp briefly before freaking out with aura no ash.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10407022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137706 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -98,7 +98,7 @@
           # imply using ash. This rule should be removed for the future when
           # both Linux and Windows are using the aura windows without the ash
           # interface.
-          ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', {
+          ['use_aura==1 and ((OS=="linux" and chromeos==0))', {
             'use_ash%': 1,
           }],
           ['use_ash==1', {

chrome/chrome_browser.gypi

@@ -4369,6 +4369,19 @@
             '../ui/aura/aura.gyp:aura',
             '../ui/compositor/compositor.gyp:compositor',
           ],
+          'conditions': [
+            ['OS=="win"', {
+              'sources/': [
+                ['exclude', '^browser/background/background_mode_manager_aura.cc'],
+                ['exclude', '^browser/ui/webui/certificate_viewer_webui.cc'],
+                ['exclude', '^browser/ui/webui/certificate_viewer_webui.h'],
+                ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
+                ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
+                ['exclude', '^browser/ui/browser_list_win.cc'],
+                ['exclude', '^browser/fullscreen_win.cc'],
+              ],
+            }],
+          ],
         }],
         ['ui_compositor_image_transport==1', {
           'dependencies': [

content/browser/web_contents/web_contents_view_aura.cc

@@ -223,9 +223,7 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size) {
   window_->SetType(aura::client::WINDOW_TYPE_CONTROL);
   window_->SetTransparent(false);
   window_->Init(ui::LAYER_NOT_DRAWN);
-#if defined(USE_ASH)
   window_->SetParent(NULL);
-#endif
   window_->layer()->SetMasksToBounds(true);
   window_->SetName("WebContentsViewAura");
 

ui/aura/desktop/desktop_stacking_client.cc

@@ -18,7 +18,11 @@ DesktopStackingClient::~DesktopStackingClient() {
 }
 
 Window* DesktopStackingClient::GetDefaultParent(Window* window) {
-  return window->GetRootWindow();
+  if (!null_parent_.get()) {
+    null_parent_.reset(new aura::RootWindow(gfx::Rect(100, 100)));
+    null_parent_->Init();
+  }
+  return null_parent_.get();
 }
 
 }  // namespace aura

ui/aura/desktop/desktop_stacking_client.h

@@ -9,9 +9,11 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/aura/aura_export.h"
 
 namespace aura {
+class RootWindow;
 class Window;
 
 // A stacking client for the desktop; always sets the default parent to the
@@ -24,6 +26,10 @@ class AURA_EXPORT DesktopStackingClient : public client::StackingClient {
   // Overridden from client::StackingClient:
   virtual Window* GetDefaultParent(Window* window) OVERRIDE;
 
+ private:
+  // Windows with NULL parents are parented to this.
+  scoped_ptr<aura::RootWindow> null_parent_;
+
   DISALLOW_COPY_AND_ASSIGN(DesktopStackingClient);
 };
 

ui/views/widget/desktop_native_widget_helper_aura.cc

@@ -40,6 +40,7 @@ DesktopNativeWidgetHelperAura::~DesktopNativeWidgetHelperAura() {
 
 void DesktopNativeWidgetHelperAura::PreInitialize(
     const Widget::InitParams& params) {
+#if !defined(OS_WIN)
   // We don't want the status bubble or the omnibox to get their own root
   // window on the desktop; on Linux
   //
@@ -52,6 +53,7 @@ void DesktopNativeWidgetHelperAura::PreInitialize(
   } else if (params.type == Widget::InitParams::TYPE_CONTROL) {
     return;
   }
+#endif
 
   gfx::Rect bounds = params.bounds;
   if (bounds.IsEmpty()) {