Revert 159945. The patch will reland in two pieces to make it possible to merge back to M23 branch.

---
ash: Change the way the bounds is set on the dimmer widget.

Set the bounds on the aura-window, instead of the views-widget, of the dimmer window.
And make sure it has the same properties set as the launcher widget.

BUG=152508

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

TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/11031070

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

1 files changed, 1 insertions, 3 deletions

diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index f8e8439..b21681f 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -122,7 +122,7 @@ class DimmerView : public views::WidgetDelegateView,
                                      const gfx::Rect& old_bounds,
                                      const gfx::Rect& new_bounds) OVERRIDE {
     CHECK_EQ(window, launcher_->GetNativeWindow());
-    GetWidget()->GetNativeWindow()->SetBounds(window->bounds());
+    GetWidget()->SetBounds(launcher_->GetWindowBoundsInScreen());
   }
 
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {
@@ -285,8 +285,6 @@ void Launcher::SetDimsShelf(bool value) {
   dimmer_->set_focus_on_creation(false);
   dimmer_->SetContentsView(new DimmerView(widget_.get()));
   dimmer_->GetNativeView()->SetName("LauncherDimmerView");
-  dimmer_->GetNativeView()->SetProperty(internal::kStayInSameRootWindowKey,
-                                        true);
   dimmer_->Show();
 }