Moves management of transients out of Window

chrome/browser/ui/views/extensions/extension_popup.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/extensions/extension_popup.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/window.h"
+#include "ui/views/corewm/transient_window_manager.h"
 #include "ui/views/corewm/window_animations.h"
 #endif
 
 #if defined(OS_WIN)
 #include "ui/views/win/hwnd_util.h"
 #endif
 
 using content::BrowserContext;
 using content::RenderViewHost;
 using content::WebContents;
@@ skipping 137 matching lines @@
   // DesktopNativeWidgetAura does not trigger the expected browser widget
   // [de]activation events when activating widgets in its own root window.
   // This additional check handles those cases. See: http://crbug.com/320889
   aura::Window* this_window = GetWidget()->GetNativeWindow();
   aura::Window* anchor_window = anchor_widget()->GetNativeWindow();
   chrome::HostDesktopType host_desktop_type =
       chrome::GetHostDesktopTypeForNativeWindow(this_window);
   if (!inspect_with_devtools_ && anchor_window == gained_active &&
       host_desktop_type != chrome::HOST_DESKTOP_TYPE_ASH &&
       this_window->GetRootWindow() == anchor_window->GetRootWindow() &&
-      gained_active->transient_parent() != this_window)
+      views::corewm::GetTransientParent(gained_active) != this_window)
     GetWidget()->Close();
 }
 #endif
 
 // static
 ExtensionPopup* ExtensionPopup::ShowPopup(const GURL& url,
                                           Browser* browser,
                                           views::View* anchor_view,
                                           views::BubbleBorder::Arrow arrow,
                                           ShowAction show_action) {
@@ skipping 33 matching lines @@
 
   // Focus on the host contents when the bubble is first shown.
   host()->host_contents()->GetView()->Focus();
 
   if (inspect_with_devtools_) {
     DevToolsWindow::ToggleDevToolsWindow(host()->render_view_host(),
         true,
         DevToolsToggleAction::ShowConsole());
   }
 }