cros: Fix crash in AppNonClientFrameViewAura::ControlView::ButtonPressed

chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/app_non_client_frame_view_aura.h"
 
 #include "base/debug/stack_trace.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/ash_resources.h"
@@ skipping 144 matching lines @@
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE {
     owner_->CloseControlWidget();
   }
 
  private:
   AppNonClientFrameViewAura* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameObserver);
 };
 
+const char AppNonClientFrameViewAura::kControlWindowName[] =

[sky, 2012/09/20 20:02:15]

Typically we put:
// static
on the line before this.

[James Cook, 2012/09/20 20:06:54]

Done.

+    "AppNonClientFrameViewAuraControls";
+
 AppNonClientFrameViewAura::AppNonClientFrameViewAura(
     BrowserFrame* frame, BrowserView* browser_view)
     : BrowserNonClientFrameView(frame, browser_view),
       control_view_(new ControlView(this)),
       control_widget_(NULL),
       frame_observer_(new FrameObserver(this)) {
   // This FrameView is always maximized so we don't want the window to have
   // resize borders.
   frame->GetNativeView()->set_hit_test_bounds_override_inner(gfx::Insets());
   // Watch for frame close so we can clean up the control widget.
   frame->AddObserver(frame_observer_.get());
   set_background(views::Background::CreateSolidBackground(SK_ColorBLACK));
   // Create the controls.
   control_widget_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
   params.parent = browser_view->GetNativeWindow();
   params.transparent = true;
   control_widget_->Init(params);
   control_widget_->SetContentsView(control_view_);
   aura::Window* window = control_widget_->GetNativeView();
-  window->SetName("AppNonClientFrameViewAuraControls");
+  window->SetName(kControlWindowName);
   gfx::Rect control_bounds = GetControlBounds();
   window->SetBounds(control_bounds);
   control_widget_->Show();
 }
 
 AppNonClientFrameViewAura::~AppNonClientFrameViewAura() {
   frame()->RemoveObserver(frame_observer_.get());
+  // This frame view can be replaced (and deleted) if the window is restored
+  // via a keyboard shortcut like Alt-[.  Ensure we close the control widget.
+  CloseControlWidget();
 }
 
 gfx::Rect AppNonClientFrameViewAura::GetBoundsForClientView() const {
   return GetLocalBounds();
 }
 
 gfx::Rect AppNonClientFrameViewAura::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   return client_bounds;
 }
@@ skipping 46 matching lines @@
       location.x(), location.y(),
       preferred.width(), preferred.height());
 }
 
 void AppNonClientFrameViewAura::CloseControlWidget() {
   if (control_widget_) {
     control_widget_->Close();
     control_widget_ = NULL;
   }
 }