Revert 198491 "Render opaque border with no shadow for web conte..."

trunk/src/chrome/browser/ui/views/constrained_window_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 "chrome/browser/ui/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 17 matching lines @@
 #include "net/base/net_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
-#include "ui/views/border.h"
 #include "ui/views/color_constants.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/client_view.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/views/window/frame_background.h"
@@ skipping 60 matching lines @@
 
   // WidgetObserver overrides
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE {
     delete this;
   }
 
   // WebContentsModalDialogHostObserver overrides
   virtual void OnPositionRequiresUpdate() OVERRIDE {
     gfx::Size size = target_widget_->GetWindowBoundsInScreen().size();
     gfx::Point position = host_->GetDialogPosition(size);
-    views::Border* border =
-        target_widget_->non_client_view()->frame_view()->border();
-    // Border may be null during widget initialization.
-    if (border) {
-      // Align the first row of pixels inside the border. This is the apparent
-      // top of the dialog.
-      gfx::Insets border_insets = border->GetInsets();
-      position -= gfx::Vector2d(border_insets.left(), border_insets.top());
-    }
     target_widget_->SetBounds(gfx::Rect(position, size));
   }
 
  private:
   WebContentsModalDialogHost* host_;
   views::Widget* target_widget_;
   const char* const native_window_property_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsModalDialogHostObserverViews);
 };
@@ skipping 535 matching lines @@
     dialog->SetNativeWindowProperty(kWebContentsModalDialogHostObserverViewsKey,
                                     dialog_host_observer);
   }
 
   return dialog;
 }
 
 views::NonClientFrameView* CreateConstrainedStyleNonClientFrameView(
     views::Widget* widget,
     content::BrowserContext* browser_context) {
-  if (views::DialogDelegate::UseNewStyle()) {
-#if defined(USE_AURA)
-    const bool force_opaque_border = false;
-#else
-    const bool force_opaque_border = true;
-#endif
-    return views::DialogDelegate::CreateNewStyleFrameView(widget,
-                                                          force_opaque_border);
-  }
+  if (views::DialogDelegate::UseNewStyle())
+    return views::DialogDelegate::CreateNewStyleFrameView(widget);
 #if defined(USE_ASH)
   ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh;
   frame->Init(widget);
   return frame;
 #endif
   return new ConstrainedWindowFrameView(widget,
                                         browser_context->IsOffTheRecord());
 }