Finally rip the global StackingClient bandaid off.

- Removes the aura::client::SetStackingClient(StackingClient*) interface.
- Moves the ash StackingController from a singleton owned by ash::Shell to one StackingController per RootWindow owned by the ash::RootWindowController. (Also removes a spurious delegate method, where every implementation creates the same object, including tests.)
- Removes the global DesktopStackingClient and related interfaces.
- Fix the ChromeViewsDelegate so that it still sets context in chromeos builds.
- Rename content::ShellStackingClientAsh to content::MinimalAsh to reflect what it really does.

In addition, the following fix ups apply:

- Previously, WebContentsViewAura asserted that it needed a context window. Now if no context window is provided, it isn't added to an aura hierarchy. There are times when that context doesn't exist: various chromeos dialogs that directly invoke WebView and toplevel extension/app windows that are created from background pages that don't have contexts.

BUG=161882

Review URL: https://codereview.chromium.org/11829040

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

1 files changed, 2 insertions, 2 deletions

diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index b688e45..4d27b50 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -81,11 +81,11 @@ class DemoStackingClient : public aura::client::StackingClient {
  public:
   explicit DemoStackingClient(aura::RootWindow* root_window)
       : root_window_(root_window) {
-    aura::client::SetStackingClient(this);
+    aura::client::SetStackingClient(root_window_, this);
   }
 
   virtual ~DemoStackingClient() {
-    aura::client::SetStackingClient(NULL);
+    aura::client::SetStackingClient(root_window_, NULL);
   }
 
   // Overridden from aura::client::StackingClient: