Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3430)

Unified Diff: ash/wm/caption_buttons/frame_maximize_button.h

Issue 169443005: Fix crash which occurs when a widget destroys itself as a result of ET_GESTURE_TAP_DOWN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/wm/caption_buttons/frame_maximize_button.cc » ('j') | ui/views/widget/root_view.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/caption_buttons/frame_maximize_button.h
diff --git a/ash/wm/caption_buttons/frame_maximize_button.h b/ash/wm/caption_buttons/frame_maximize_button.h
index a1bb991a98f68ea832e98fa5ef16d4a8a4307c54..8e254ff33341ee67097c2201df77ca87e88c9484 100644
--- a/ash/wm/caption_buttons/frame_maximize_button.h
+++ b/ash/wm/caption_buttons/frame_maximize_button.h
@@ -8,6 +8,7 @@
#include "ash/ash_export.h"
#include "ash/wm/caption_buttons/caption_button_types.h"
#include "ash/wm/caption_buttons/frame_caption_button.h"
+#include "ash/wm/window_state_observer.h"
#include "ash/wm/workspace/snap_types.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
@@ -32,7 +33,8 @@ class MaximizeBubbleController;
// Button used for the maximize control on the frame. Handles snapping logic.
class ASH_EXPORT FrameMaximizeButton : public FrameCaptionButton,
public views::WidgetObserver,
- public aura::WindowObserver {
+ public aura::WindowObserver,
+ public wm::WindowStateObserver {
public:
FrameMaximizeButton(views::ButtonListener* listener,
views::Widget* frame);
@@ -67,6 +69,10 @@ class ASH_EXPORT FrameMaximizeButton : public FrameCaptionButton,
intptr_t old) OVERRIDE;
virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
+ // wm::WindowStateObserver override:
+ virtual void OnPostWindowShowTypeChange(wm::WindowState* window_state,
+ wm::WindowShowType old_type) OVERRIDE;
+
// WidgetObserver overrides:
virtual void OnWidgetActivationChanged(views::Widget* widget,
bool active) OVERRIDE;
« no previous file with comments | « no previous file | ash/wm/caption_buttons/frame_maximize_button.cc » ('j') | ui/views/widget/root_view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698