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

Unified Diff: ui/views/window/dialog_delegate.cc

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Fix various unit-tests Created 3 years, 9 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
« ui/views/views_delegate.cc ('K') | « ui/views/window/dialog_client_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/window/dialog_delegate.cc
diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
index 9122b1033bb867694c0a3ae7ed03c7cd9fc450ca..c55e484c5a5e597f15b6e5061cd272a41d0a28b1 100644
--- a/ui/views/window/dialog_delegate.cc
+++ b/ui/views/window/dialog_delegate.cc
@@ -16,8 +16,8 @@
#include "ui/views/bubble/bubble_frame_view.h"
#include "ui/views/controls/button/label_button.h"
#include "ui/views/layout/layout_constants.h"
+#include "ui/views/layout/views_layout_delegate.h"
#include "ui/views/style/platform_style.h"
-#include "ui/views/views_delegate.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_observer.h"
#include "ui/views/window/dialog_client_view.h"
@@ -201,7 +201,7 @@ NonClientFrameView* DialogDelegate::CreateDialogFrameView(
Widget* widget,
const gfx::Insets& content_margins) {
BubbleFrameView* frame =
- new BubbleFrameView(ViewsDelegate::GetInstance()->GetInsetsMetric(
+ new BubbleFrameView(ViewsLayoutDelegate::Get()->GetInsetsMetric(
InsetsMetric::DIALOG_FRAME_VIEW),
content_margins);
const BubbleBorder::Shadow kShadow = BubbleBorder::SMALL_SHADOW;
« ui/views/views_delegate.cc ('K') | « ui/views/window/dialog_client_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698