chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.cc - Issue 2859193004: Remove GridLayout::SetInsets in favor of an empty border on the host.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.cc

Issue 2859193004: Remove GridLayout::SetInsets in favor of an empty border on the host. (Closed)

Patch Set: missed a merge problem Created 3 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 | « chrome/browser/ui/views/cookie_info_view.cc ('k') | chrome/browser/ui/views/extensions/extension_install_dialog_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.cc

diff --git a/chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.cc b/chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.cc

index 7f722992667e3fcbbd66664c3fdefc309ea8ce70..c8784e5c9b93960e3224728c57e3e0ed1f7e8f15 100644

--- a/chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.cc

+++ b/chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.cc

@@ -41,16 +41,16 @@ DesktopIOSPromotionBubbleView::DesktopIOSPromotionBubbleView(

this,

entry_point)) {

views::GridLayout* layout = new views::GridLayout(this);

+ SetLayoutManager(layout);

ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();

- layout->SetInsets(

+ SetBorder(views::CreateEmptyBorder(

provider->GetDistanceMetric(DISTANCE_PANEL_CONTENT_MARGIN) +

desktop_ios_promotion::GetPromoImage(

GetNativeTheme()->GetSystemColor(

ui::NativeTheme::kColorId_TextfieldDefaultColor))

.width(),

- 0, 0);

- SetLayoutManager(layout);

+ 0, 0));

send_sms_button_ = views::MdTextButton::CreateSecondaryUiBlueButton(

this, l10n_util::GetStringUTF16(IDS_DESKTOP_TO_IOS_PROMO_SEND_TO_PHONE));

no_button_ = views::MdTextButton::CreateSecondaryUiButton(

« no previous file with comments | « chrome/browser/ui/views/cookie_info_view.cc ('k') | chrome/browser/ui/views/extensions/extension_install_dialog_view.cc » ('j') | no next file with comments »