Remove DialogDelegate::UseNewStyle and unused code.

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/native_web_contents_modal_dialog_manager.h"
@@ skipping 59 matching lines @@
     views::Widget* widget = GetWidget(dialog);
     widget->AddObserver(this);
     observed_widgets_.insert(widget);
     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);
 
-    if (views::DialogDelegate::UseNewStyle()) {
-      views::corewm::SetWindowVisibilityAnimationType(
-          widget->GetNativeWindow(),
-          views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_ROTATE);
-    }
+    views::corewm::SetWindowVisibilityAnimationType(
+        widget->GetNativeWindow(),
+        views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_ROTATE);
 #endif
 
 #if defined(USE_ASH)
     gfx::NativeView parent = platform_util::GetParent(widget->GetNativeView());
     views::corewm::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);
     }
 
     // TODO(wittman): remove once the new visual style is complete
     widget->GetNativeWindow()->SetProperty(ash::kConstrainedWindowKey, true);
     views::corewm::SetModalParent(
         widget->GetNativeWindow(),
         platform_util::GetParent(widget->GetNativeView()));
 #endif
   }
 
   virtual void ShowDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
     views::Widget* widget = GetWidget(dialog);
 #if defined(USE_AURA)
     scoped_ptr<views::corewm::SuspendChildWindowVisibilityAnimations> suspend;
-    if (views::DialogDelegate::UseNewStyle() &&
-        shown_widgets_.find(widget) != shown_widgets_.end()) {
+    if (shown_widgets_.find(widget) != shown_widgets_.end()) {
       suspend.reset(new views::corewm::SuspendChildWindowVisibilityAnimations(
           widget->GetNativeWindow()->parent()));
     }
 #endif
     // Host may be NULL during tab drag on Views/Win32.
     if (host_)
       UpdateWebContentsModalDialogPosition(widget, host_);
     widget->Show();
     FocusDialog(dialog);
 
 #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
   }
 
   virtual void HideDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
     views::Widget* widget = GetWidget(dialog);
 #if defined(USE_AURA)
     scoped_ptr<views::corewm::SuspendChildWindowVisibilityAnimations> suspend;
-    if (views::DialogDelegate::UseNewStyle()) {
-      suspend.reset(new views::corewm::SuspendChildWindowVisibilityAnimations(
-          widget->GetNativeWindow()->parent()));
-    }
+    suspend.reset(new views::corewm::SuspendChildWindowVisibilityAnimations(
+        widget->GetNativeWindow()->parent()));
 #endif
     widget->Hide();
   }
 
   virtual void CloseDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
     GetWidget(dialog)->Close();
   }
 
   virtual void FocusDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
     views::Widget* widget = GetWidget(dialog);
@@ skipping 44 matching lines @@
     WidgetClosing(widget);
   }
 
   virtual void HostChanged(
       web_modal::WebContentsModalDialogHost* new_host) OVERRIDE {
     if (host_)
       host_->RemoveObserver(this);
 
     host_ = new_host;
 
-    if (host_)
+    // |host_| may be null during WebContents destruction or Win32 tab dragging.
+    if (host_) {
       host_->AddObserver(this);
 
-    // Old-style dialogs are parented to the web contents view and don't need
-    // reparenting.  The host_ may be null during tab drag under Views/Win32 or
-    // when destroying the WebContents.
-    if (views::DialogDelegate::UseNewStyle() && host_) {
-      for (std::set<views::Widget*>::iterator it = observed_widgets_.begin();
-           it != observed_widgets_.end();
-           ++it) {
+      std::set<views::Widget*>::iterator it = observed_widgets_.begin();

[sky, 2013/11/16 03:03:16]

move inside lop.

[msw, 2013/11/16 04:15:44]

Done.

+      for (; it != observed_widgets_.end(); ++it) {
         views::Widget::ReparentNativeView((*it)->GetNativeView(),
                                           host_->GetHostView());
       }
 
       OnPositionRequiresUpdate();
     }
   }
 
  private:
   static views::Widget* GetWidget(NativeWebContentsModalDialog dialog) {
@@ skipping 29 matching lines @@
 
 namespace web_modal {
 
 NativeWebContentsModalDialogManager* WebContentsModalDialogManager::
 CreateNativeManager(
     NativeWebContentsModalDialogManagerDelegate* native_delegate) {
   return new NativeWebContentsModalDialogManagerViews(native_delegate);
 }
 
 }  // namespace web_modal