MacViews: Refactor aura dependency from ExtensionPopup

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 "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/extension_view_host_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "ui/aura/window.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
-#include "ui/wm/core/window_animations.h"
-#include "ui/wm/core/window_util.h"
-#include "ui/wm/public/activation_client.h"
 
 namespace {
 
 ExtensionViewViews* GetExtensionView(extensions::ExtensionViewHost* host) {
   return static_cast<ExtensionViewViews*>(host->view());
 }
 
 }  // namespace
 
 // The minimum/maximum dimensions of the popup.
 // The minimum is just a little larger than the size of the button itself.
 // The maximum is an arbitrary number that should be smaller than most screens.
 const int ExtensionPopup::kMinWidth = 25;
 const int ExtensionPopup::kMinHeight = 25;
 const int ExtensionPopup::kMaxWidth = 800;
 const int ExtensionPopup::kMaxHeight = 600;
 
+#if !defined(USE_AURA)
+// static
+ExtensionPopup* ExtensionPopup::Create(extensions::ExtensionViewHost* host,
+                                       views::View* anchor_view,
+                                       views::BubbleBorder::Arrow arrow,
+                                       ShowAction show_action) {
+  auto popup = new ExtensionPopup(host, anchor_view, arrow, show_action);
+  views::BubbleDelegateView::CreateBubble(popup);
+  return popup;
+}
+#endif
+
 ExtensionPopup::ExtensionPopup(extensions::ExtensionViewHost* host,
                                views::View* anchor_view,
                                views::BubbleBorder::Arrow arrow,
                                ShowAction show_action)
     : BubbleDelegateView(anchor_view, arrow),
       host_(host),
       devtools_callback_(base::Bind(
           &ExtensionPopup::OnDevToolsStateChanged, base::Unretained(this))),
       widget_initialized_(false) {
   inspect_with_devtools_ = show_action == SHOW_AND_INSPECT;
@@ skipping 78 matching lines @@
 }
 
 void ExtensionPopup::ViewHierarchyChanged(
   const ViewHierarchyChangedDetails& details) {
   // TODO(msw): Find any remaining crashes related to http://crbug.com/327776
   // No view hierarchy changes are expected if the widget no longer exists.
   widget_initialized_ |= details.child == this && details.is_add && GetWidget();
   CHECK(GetWidget() || !widget_initialized_);
 }
 
-void ExtensionPopup::OnWidgetDestroying(views::Widget* widget) {
-  BubbleDelegateView::OnWidgetDestroying(widget);
-  aura::Window* bubble_window = GetWidget()->GetNativeWindow();
-  aura::client::ActivationClient* activation_client =
-      aura::client::GetActivationClient(bubble_window->GetRootWindow());
-  // If the popup was being inspected with devtools and the browser window was
-  // closed, then the root window and activation client are already destroyed.
-  if (activation_client)
-    activation_client->RemoveObserver(this);
-}
-
 void ExtensionPopup::OnWidgetActivationChanged(views::Widget* widget,
                                                bool active) {
-  // TODO(msw): Find any remaining crashes related to http://crbug.com/327776
-  // No calls are expected if the widget isn't initialized or no longer exists.
-  CHECK(widget_initialized_);
-  CHECK(GetWidget());
-
-  // Close on anchor window activation (ie. user clicked the browser window).
-  if (!inspect_with_devtools_ && widget && active &&
-      widget->GetNativeWindow() == anchor_widget()->GetNativeWindow())
-    GetWidget()->Close();
-}
-
-void ExtensionPopup::OnWindowActivated(aura::Window* gained_active,
-                                       aura::Window* lost_active) {
-  // TODO(msw): Find any remaining crashes related to http://crbug.com/327776
-  // No calls are expected if the widget isn't initialized or no longer exists.
-  CHECK(widget_initialized_);
-  CHECK(GetWidget());
-
-  // Close on anchor window activation (ie. user clicked the browser window).
-  // 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
-  if (!inspect_with_devtools_ &&
-      gained_active == anchor_widget()->GetNativeWindow())
-    GetWidget()->Close();
+  if (active && widget == anchor_widget())
+    OnAnchorWindowActivation();
 }
 
 void ExtensionPopup::ActiveTabChanged(content::WebContents* old_contents,
                                       content::WebContents* new_contents,
                                       int index,
                                       int reason) {
   GetWidget()->Close();
 }
 
+void ExtensionPopup::OnAnchorWindowActivation() {
+  // TODO(msw): Find any remaining crashes related to http://crbug.com/327776
+  // No calls are expected if the widget isn't initialized or no longer exists.
+  CHECK(widget_initialized_);
+  CHECK(GetWidget());
+
+  if (!inspect_with_devtools_)
+    GetWidget()->Close();
+}
+
 // static
 ExtensionPopup* ExtensionPopup::ShowPopup(const GURL& url,
                                           Browser* browser,
                                           views::View* anchor_view,
                                           views::BubbleBorder::Arrow arrow,
                                           ShowAction show_action) {
   extensions::ExtensionViewHost* host =
       extensions::ExtensionViewHostFactory::CreatePopupHost(url, browser);
-  ExtensionPopup* popup = new ExtensionPopup(host, anchor_view, arrow,
-      show_action);
-  views::BubbleDelegateView::CreateBubble(popup);
-
-  gfx::NativeView native_view = popup->GetWidget()->GetNativeView();
-  wm::SetWindowVisibilityAnimationType(
-      native_view, wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
-  wm::SetWindowVisibilityAnimationVerticalPosition(native_view, -3.0f);
+  auto popup = ExtensionPopup::Create(host, anchor_view, arrow, show_action);
 
   // If the host had somehow finished loading, then we'd miss the notification
   // and not show.  This seems to happen in single-process mode.
   if (host->did_stop_loading())
     popup->ShowBubble();
 
-  aura::Window* bubble_window = popup->GetWidget()->GetNativeWindow();
-  aura::client::ActivationClient* activation_client =
-      aura::client::GetActivationClient(bubble_window->GetRootWindow());
-  activation_client->AddObserver(popup);
-
   return popup;
 }
 
 void ExtensionPopup::ShowBubble() {
   GetWidget()->Show();
 
   // Focus on the host contents when the bubble is first shown.
   host()->host_contents()->Focus();
 
   if (inspect_with_devtools_) {
     DevToolsWindow::OpenDevToolsWindow(host()->host_contents(),
                                        DevToolsToggleAction::ShowConsole());
   }
 }