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

Unified Diff: chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc

Issue 13925019: fix GridLayout::CreatePanel for new style dialogs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: msw review Created 7 years, 8 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 | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc
diff --git a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc
index 79b8db51fd4615a1d60f2956ca6c9b33c4f96397..2c221741e20727d2f148f0779a494eab058d40b5 100644
--- a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc
+++ b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc
@@ -57,9 +57,15 @@ IdleActionWarningDialogView::IdleActionWarningDialogView() : closing_(false) {
FixedWidthLabel* content = new FixedWidthLabel(
l10n_util::GetStringUTF16(IDS_IDLE_WARNING_LOGOUT_WARNING),
kIdleActionWarningContentWidth);
- content->set_border(views::Border::CreateEmptyBorder(
- views::kPanelVertMargin, views::kPanelHorizMargin,
- views::kPanelVertMargin, views::kPanelHorizMargin));
+ if (DialogDelegate::UseNewStyle()) {
+ content->set_border(views::Border::CreateEmptyBorder(
+ views::kPanelVertMargin, views::kButtonHEdgeMarginNew,
+ views::kPanelVertMargin, views::kButtonHEdgeMarginNew));
+ } else {
+ content->set_border(views::Border::CreateEmptyBorder(
+ views::kPanelVertMargin, views::kPanelHorizMargin,
+ views::kPanelVertMargin, views::kPanelHorizMargin));
+ }
AddChildView(content);
SetLayoutManager(new views::FillLayout());
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698