diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 22:25:53 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 22:25:53 +0000 |
| commit | 29800fa252d5c10cca07520ac37f4687ad10e41a (patch) | |
| tree | d16bf6f474ab4ccbdc5e2cf61d13574c54dbb2c9 | |
| parent | b90f78c5a978634fb6ae4c46dfc764c967de9bea (diff) | |
| download | chromium_src-29800fa252d5c10cca07520ac37f4687ad10e41a.zip chromium_src-29800fa252d5c10cca07520ac37f4687ad10e41a.tar.gz chromium_src-29800fa252d5c10cca07520ac37f4687ad10e41a.tar.bz2 | |
Revert 160155 - Merge 159945 - 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/11066022
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/11028039
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@160246 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/launcher/launcher.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc index a725ea3..d59b231 100644 --- a/ash/launcher/launcher.cc +++ b/ash/launcher/launcher.cc @@ -121,7 +121,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 { @@ -282,8 +282,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(); } |