Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc
index 5c5b9db..83c184d 100644
--- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc
+++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc
@@ -45,6 +45,11 @@
///////////////////////////////////////////////////////////////////////////////
// DesktopBrowserFrameAura, views::DesktopNativeWidgetAura overrides:
+void DesktopBrowserFrameAura::OnHostClosed() {
+ aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), NULL);
+ DesktopNativeWidgetAura::OnHostClosed();
+}
+
void DesktopBrowserFrameAura::InitNativeWidget(
const views::Widget::InitParams& params) {
browser_desktop_root_window_host_ =
@@ -71,11 +76,6 @@
GetNativeView()->GetRootWindow());
}
-void DesktopBrowserFrameAura::OnWindowDestroying() {
- aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), NULL);
- DesktopNativeWidgetAura::OnWindowDestroying();
-}
-
////////////////////////////////////////////////////////////////////////////////
// DesktopBrowserFrameAura, NativeBrowserFrame implementation: