Revert 132856 - Aura/ash split: Remove hacks and get chrome linking without ash.

views_unittests failure on Linux Chromeos.

For the first time now, you can do:

    > build/gyp_chromium -Duse_aura=1 -Duse_ash=0

And get a running chrome. It has lots of issues, especially related to
window placement, tab handling, etc, but it pops up and renders web content.

Also consolidates most of the desktop behavior into its own class.

Also makes views_examples_exe work again. Several of the hacks are no longer
needed after Ben's refactoring to support WebView.

BUG=116458,119759
TEST=none

Review URL: http://codereview.chromium.org/10081022

TBR=erg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10083057

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

3 files changed, 0 insertions, 58 deletions

diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 48a8122..aa46a9f 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -57,8 +57,6 @@
         'desktop/desktop_dispatcher_client.h',
         'desktop/desktop_root_window_event_filter.cc',
         'desktop/desktop_root_window_event_filter.h',
-        'desktop/desktop_stacking_client.cc',
-        'desktop/desktop_stacking_client.h',
         'dispatcher_linux.cc',
         'dispatcher_linux.h',
         'dispatcher_win.cc',
diff --git a/ui/aura/desktop/desktop_stacking_client.cc b/ui/aura/desktop/desktop_stacking_client.cc
deleted file mode 100644
index cbe6c27..0000000
--- a/ui/aura/desktop/desktop_stacking_client.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "ui/aura/desktop/desktop_stacking_client.h"
-
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
-
-namespace aura {
-
-DesktopStackingClient::DesktopStackingClient() {
-  aura::client::SetStackingClient(this);
-}
-
-DesktopStackingClient::~DesktopStackingClient() {
-  aura::client::SetStackingClient(NULL);
-}
-
-Window* DesktopStackingClient::GetDefaultParent(Window* window) {
-  return window->GetRootWindow();
-}
-
-}  // namespace aura
diff --git a/ui/aura/desktop/desktop_stacking_client.h b/ui/aura/desktop/desktop_stacking_client.h
deleted file mode 100644
index 34b8a67..0000000
--- a/ui/aura/desktop/desktop_stacking_client.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2012 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 UI_AURA_DESKTOP_DESKTOP_STACKING_CLIENT_H_
-#define UI_AURA_DESKTOP_DESKTOP_STACKING_CLIENT_H_
-
-#include "ui/aura/client/stacking_client.h"
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "ui/aura/aura_export.h"
-
-namespace aura {
-class Window;
-
-// A stacking client for the desktop; always sets the default parent to the
-// RootWindow of the passed in Window.
-class AURA_EXPORT DesktopStackingClient : public client::StackingClient {
- public:
-  DesktopStackingClient();
-  virtual ~DesktopStackingClient();
-
-  // Overridden from client::StackingClient:
-  virtual Window* GetDefaultParent(Window* window) OVERRIDE;
-
-  DISALLOW_COPY_AND_ASSIGN(DesktopStackingClient);
-};
-
-}  // namespace aura
-
-#endif  // UI_AURA_DESKTOP_DESKTOP_STACKING_CLIENT_H_