diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 09:22:47 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 09:22:47 +0000 |
| commit | d6b1eb4cfac37924b348027f1051b1dfcd117d58 (patch) | |
| tree | 36198e38103875cac91dffa0452af7be2c5ccfc3 /ash/wm/workspace/frame_maximize_button.cc | |
| parent | 2bdebe7e9cd0c8d6bf4785e1c891684f8d61ed3d (diff) | |
| download | chromium_src-d6b1eb4cfac37924b348027f1051b1dfcd117d58.zip chromium_src-d6b1eb4cfac37924b348027f1051b1dfcd117d58.tar.gz chromium_src-d6b1eb4cfac37924b348027f1051b1dfcd117d58.tar.bz2 | |
Crash on clicking the maximize button
BUG=222243
TEST=unittest
Review URL: https://chromiumcodereview.appspot.com/12663019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace/frame_maximize_button.cc')
| -rw-r--r-- | ash/wm/workspace/frame_maximize_button.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc index 33926c8..f47e470 100644 --- a/ash/wm/workspace/frame_maximize_button.cc +++ b/ash/wm/workspace/frame_maximize_button.cc @@ -83,7 +83,7 @@ FrameMaximizeButton::FrameMaximizeButton(views::ButtonListener* listener, frame_(frame), is_snap_enabled_(false), exceeded_drag_threshold_(false), - window_(NULL), + widget_(NULL), press_is_gesture_(false), snap_type_(SNAP_NONE), bubble_appearance_delay_ms_(kBubbleAppearanceDelayMS) { @@ -95,8 +95,8 @@ FrameMaximizeButton::~FrameMaximizeButton() { // Before the window gets destroyed, the maximizer dialog needs to be shut // down since it would otherwise call into a deleted object. maximizer_.reset(); - if (window_) - OnWindowDestroying(window_); + if (widget_) + OnWindowDestroying(widget_->GetNativeWindow()); } void FrameMaximizeButton::SnapButtonHovered(SnapType type) { @@ -170,11 +170,11 @@ void FrameMaximizeButton::OnWindowPropertyChanged(aura::Window* window, void FrameMaximizeButton::OnWindowDestroying(aura::Window* window) { maximizer_.reset(); - if (window_) { - CHECK_EQ(window_, window); - window_->RemoveObserver(this); - window_ = NULL; - frame_->GetWidget()->RemoveObserver(this); + if (widget_) { + CHECK_EQ(widget_->GetNativeWindow(), window); + widget_->GetNativeWindow()->RemoveObserver(this); + widget_->RemoveObserver(this); + widget_ = NULL; } } @@ -203,10 +203,10 @@ void FrameMaximizeButton::OnMouseEntered(const ui::MouseEvent& event) { ImageButton::OnMouseEntered(event); if (!maximizer_.get()) { DCHECK(GetWidget()); - if (!window_) { - window_ = frame_->GetWidget()->GetNativeWindow(); - window_->AddObserver(this); - frame_->GetWidget()->AddObserver(this); + if (!widget_) { + widget_ = frame_->GetWidget(); + widget_->GetNativeWindow()->AddObserver(this); + widget_->AddObserver(this); } maximizer_.reset(new MaximizeBubbleController( this, |