Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / omnibox / omnibox_popup_contents_view.cc

diff --git a/src/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/src/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
index 50fad6c..e4509dd 100644 (file)
--- a/src/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
+++ b/src/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
@@ -20,7 +20,6 @@
 #include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
-#include "ui/wm/core/window_animations.h"
 
 // This is the number of pixels in the border image interior to the actual
 // border.
@@ -31,7 +30,7 @@ class OmniboxPopupContentsView::AutocompletePopupWidget
       public base::SupportsWeakPtr<AutocompletePopupWidget> {
  public:
   AutocompletePopupWidget() {}
-  virtual ~AutocompletePopupWidget() {}
+  ~AutocompletePopupWidget() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWidget);
@@ -214,8 +213,7 @@ void OmniboxPopupContentsView::UpdatePopupAppearance() {
     // avoid a NULL dereference.
     if (!popup_.get())
       return;
-    wm::SetWindowVisibilityAnimationTransition(
-        popup_->GetNativeView(), wm::ANIMATE_NONE);
+    popup_->SetVisibilityAnimationTransition(views::Widget::ANIMATE_NONE);
     popup_->SetContentsView(this);
     popup_->StackAbove(omnibox_view_->GetRelativeWindowForPopup());
     if (!popup_.get()) {