Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(479)

Unified Diff: trunk/src/chrome/browser/ui/views/constrained_window_views.cc

Issue 14765016: Revert 198491 "Render opaque border with no shadow for web conte..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | trunk/src/ui/views/bubble/bubble_border.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/views/constrained_window_views.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/constrained_window_views.cc (revision 198505)
+++ trunk/src/chrome/browser/ui/views/constrained_window_views.cc (working copy)
@@ -35,7 +35,6 @@
#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"
@@ -116,15 +115,6 @@
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));
}
@@ -680,15 +670,8 @@
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);
« no previous file with comments | « no previous file | trunk/src/ui/views/bubble/bubble_border.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698