MacViews: Remove constrained window dependencies for certificate viewer.

chrome/browser/ui/views/native_web_contents_modal_dialog_manager_views.cc

 // Copyright 2016 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/native_web_contents_modal_dialog_manager_views.h"
 
 #include <memory>
 
 #include "chrome/browser/platform_util.h"
 #include "components/constrained_window/constrained_window_views.h"
@@ skipping 79 matching lines @@
     return;
 
   views::Widget* widget = GetWidget(dialog());
 #if defined(USE_AURA)
   std::unique_ptr<wm::SuspendChildWindowVisibilityAnimations> suspend;
   if (shown_widgets_.find(widget) != shown_widgets_.end()) {
     suspend.reset(new wm::SuspendChildWindowVisibilityAnimations(
         widget->GetNativeWindow()->parent()));
   }
 #endif
-  // Host may be NULL during tab drag on Views/Win32.
-  if (host_)
-    constrained_window::UpdateWebContentsModalDialogPosition(widget, host_);
-  widget->Show();
+  ShowWidget(widget);
   Focus();
 
 #if defined(USE_AURA)
   // TODO(pkotwicz): Control the z-order of the constrained dialog via
   // views::kHostViewKey. We will need to ensure that the parent window's
   // shadows are below the constrained dialog in z-order when we do this.
   shown_widgets_.insert(widget);
 #endif
 }
 
 void NativeWebContentsModalDialogManagerViews::Hide() {
   views::Widget* widget = GetWidget(dialog());
 #if defined(USE_AURA)
   std::unique_ptr<wm::SuspendChildWindowVisibilityAnimations> suspend;
   suspend.reset(new wm::SuspendChildWindowVisibilityAnimations(
       widget->GetNativeWindow()->parent()));
 #endif
-  widget->Hide();
+  HideWidget(widget);
 }
 
 void NativeWebContentsModalDialogManagerViews::Close() {
   GetWidget(dialog())->Close();
 }
 
 void NativeWebContentsModalDialogManagerViews::Focus() {
   views::Widget* widget = GetWidget(dialog());
   if (widget->widget_delegate() &&
       widget->widget_delegate()->GetInitiallyFocusedView())
@@ skipping 54 matching lines @@
     }
 
     OnPositionRequiresUpdate();
   }
 }
 
 gfx::NativeWindow NativeWebContentsModalDialogManagerViews::dialog() {
   return dialog_;
 }
 
+void NativeWebContentsModalDialogManagerViews::ShowWidget(
+    views::Widget* widget) {
+  // |host_| may be NULL during tab drag on Views/Win32.
+  if (host_)
+    constrained_window::UpdateWebContentsModalDialogPosition(widget, host_);
+  widget->Show();
+}
+
+void NativeWebContentsModalDialogManagerViews::HideWidget(
+    views::Widget* widget) {
+  widget->Hide();
+}
+
 views::Widget* NativeWebContentsModalDialogManagerViews::GetWidget(
     gfx::NativeWindow dialog) {
   views::Widget* widget = views::Widget::GetWidgetForNativeWindow(dialog);
   DCHECK(widget);
   return widget;
 }
 
 void NativeWebContentsModalDialogManagerViews::WidgetClosing(
     views::Widget* widget) {
 #if defined(USE_AURA)
   gfx::NativeView view = platform_util::GetParent(widget->GetNativeView());
   // Allow the parent to animate again.
   if (view && view->parent())
     view->parent()->ClearProperty(aura::client::kAnimationsDisabledKey);
 #endif
   widget->RemoveObserver(this);
   observed_widgets_.erase(widget);
 
 #if defined(USE_AURA)
   shown_widgets_.erase(widget);
 #endif
 
   // Will cause this object to be deleted.
   native_delegate_->WillClose(widget->GetNativeWindow());
 }