Replace USE_ASH with USE_AURA in web_contents_modal_dialog_manager_views.cc

chrome/browser/ui/views/web_contents_modal_dialog_manager_views.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 <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "components/web_modal/single_web_contents_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 #include "ui/views/border.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/wm/core/visibility_controller.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/core/window_modality_controller.h"
 #endif
 
-// TODO(wittman): this code should not depend on ash.
-#if defined(USE_ASH)
-#include "ash/ash_constants.h"
-#include "ash/frame/custom_frame_view_ash.h"
-#include "ash/shell.h"
-#endif
-
 using web_modal::NativeWebContentsModalDialog;
 using web_modal::SingleWebContentsDialogManager;
 using web_modal::SingleWebContentsDialogManagerDelegate;
 using web_modal::WebContentsModalDialogHost;
 using web_modal::ModalDialogHostObserver;
 
 namespace {
 
 class NativeWebContentsModalDialogManagerViews
     : public SingleWebContentsDialogManager,
@@ skipping 29 matching lines @@
     widget->set_movement_disabled(true);
 
 #if defined(USE_AURA)
     // TODO(wittman): remove once the new visual style is complete
     widget->GetNativeWindow()->SetProperty(aura::client::kConstrainedWindowKey,
                                            true);
 
     wm::SetWindowVisibilityAnimationType(
         widget->GetNativeWindow(),
         wm::WINDOW_VISIBILITY_ANIMATION_TYPE_ROTATE);
-#endif
 
-#if defined(USE_ASH)
     gfx::NativeView parent = platform_util::GetParent(widget->GetNativeView());
     wm::SetChildWindowVisibilityChangesAnimated(parent);
     // No animations should get performed on the window since that will re-order
     // the window stack which will then cause many problems.
     if (parent && parent->parent()) {
       parent->parent()->SetProperty(aura::client::kAnimationsDisabledKey, true);
     }
 
     wm::SetModalParent(
         widget->GetNativeWindow(),
@@ skipping 37 matching lines @@
 
   virtual void Close() override {
     GetWidget(dialog())->Close();
   }
 
   virtual void Focus() override {
     views::Widget* widget = GetWidget(dialog());
     if (widget->widget_delegate() &&
         widget->widget_delegate()->GetInitiallyFocusedView())
       widget->widget_delegate()->GetInitiallyFocusedView()->RequestFocus();
-#if defined(USE_ASH)
+#if defined(USE_AURA)
     // We don't necessarily have a RootWindow yet.
     if (widget->GetNativeView()->GetRootWindow())
       widget->GetNativeView()->Focus();
 #endif
   }
 
   virtual void Pulse() override {
   }
 
   // WebContentsModalDialogHostObserver overrides
@@ skipping 57 matching lines @@
   }
 
  private:
   static views::Widget* GetWidget(NativeWebContentsModalDialog dialog) {
     views::Widget* widget = views::Widget::GetWidgetForNativeWindow(dialog);
     DCHECK(widget);
     return widget;
   }
 
   void WidgetClosing(views::Widget* widget) {
-#if defined(USE_ASH)
+#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);
@@ skipping 17 matching lines @@
 namespace web_modal {
 
 SingleWebContentsDialogManager* WebContentsModalDialogManager::
 CreateNativeWebModalManager(
     NativeWebContentsModalDialog dialog,
     SingleWebContentsDialogManagerDelegate* native_delegate) {
   return new NativeWebContentsModalDialogManagerViews(dialog, native_delegate);
 }
 
 }  // namespace web_modal