Remove obsolete WorkspaceEventHandler::destroyed_

BUG=None
TEST=None

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

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

2 files changed, 1 insertions, 13 deletions

diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc
index ed972ad..bcd7e9e 100644
--- a/ash/wm/workspace/workspace_event_handler.cc
+++ b/ash/wm/workspace/workspace_event_handler.cc
@@ -55,13 +55,10 @@ void ToggleMaximizedState(wm::WindowState* window_state) {
 namespace internal {
 
 WorkspaceEventHandler::WorkspaceEventHandler(aura::Window* owner)
-    : ToplevelWindowEventHandler(owner),
-      destroyed_(NULL) {
+    : ToplevelWindowEventHandler(owner) {
 }
 
 WorkspaceEventHandler::~WorkspaceEventHandler() {
-  if (destroyed_)
-    *destroyed_ = true;
 }
 
 void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
@@ -91,14 +88,9 @@ void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
           event->IsOnlyLeftMouseButton() &&
           target->delegate()->GetNonClientComponent(event->location()) ==
           HTCAPTION) {
-        bool destroyed = false;
-        destroyed_ = &destroyed;
         ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
             ash::UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK);
         ToggleMaximizedState(target_state);
-        if (destroyed)
-          return;
-        destroyed_ = NULL;
       }
       multi_window_resize_controller_.Hide();
       HandleVerticalResizeDoubleClick(target_state, event);
@@ -122,7 +114,6 @@ void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event) {
       // TouchUMA::GESTURE_MAXIMIZE_DOUBLETAP is counted once.
       TouchUMA::GetInstance()->RecordGestureAction(
           TouchUMA::GESTURE_MAXIMIZE_DOUBLETAP);
-      // |this| may be destroyed from here.
       ToggleMaximizedState(wm::GetWindowState(target));
       event->StopPropagation();
       return;
diff --git a/ash/wm/workspace/workspace_event_handler.h b/ash/wm/workspace/workspace_event_handler.h
index c761f2b..e8507e1 100644
--- a/ash/wm/workspace/workspace_event_handler.h
+++ b/ash/wm/workspace/workspace_event_handler.h
@@ -42,9 +42,6 @@ class WorkspaceEventHandler : public ToplevelWindowEventHandler {
 
   MultiWindowResizeController multi_window_resize_controller_;
 
-  // If non-NULL, set to true in the destructor.
-  bool* destroyed_;
-
   DISALLOW_COPY_AND_ASSIGN(WorkspaceEventHandler);
 };