Chromium Code Reviews| Index: chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm |
| diff --git a/chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm b/chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm |
| index 3c150148d14b35208ccb5e3998517ff396c9741b..fb751a3e602b3b3af4ec373f72e58bfd1c96f6b7 100644 |
| --- a/chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm |
| +++ b/chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm |
| @@ -60,9 +60,6 @@ const CGFloat kSeparatorHeight = 1.0f; |
| const CGFloat kTableRowViewHorizontalPadding = 5.0f; |
| const CGFloat kTableRowViewVerticalPadding = 1.0f; |
| -// Distance between the adapter off help link and the scroll view boundaries. |
| -const CGFloat kAdapterOffHelpLinkPadding = 5.0f; |
| - |
| // The lookup table for signal strength level image. |
| const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR, |
| IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR, |
| @@ -434,6 +431,7 @@ void ChooserContentViewController::UpdateTableView() { |
| // Adapter turned off message. |
| adapterOffMessage_ = CreateLabel(l10n_util::GetNSStringF( |
| IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ADAPTER_OFF, base::string16())); |
| + CGFloat adapterOffMessageWidth = NSWidth([adapterOffMessage_ frame]); |
| // Connect button. |
| connectButton_ = [self createConnectButton]; |
| @@ -528,10 +526,12 @@ void ChooserContentViewController::UpdateTableView() { |
| [self addSubview:titleView_]; |
| // Adapter turned off help button. |
| - CGFloat adapterOffHelpButtonOriginX = kMarginX + kAdapterOffHelpLinkPadding; |
| - CGFloat adapterOffHelpButtonOriginY = titleOriginY - kVerticalPadding - |
| - adapterOffHelpButtonHeight - |
| - kAdapterOffHelpLinkPadding; |
| + CGFloat adapterOffHelpButtonOriginX = |
|
Robert Sesek
2017/01/10 21:25:19
Consider flooring this in case the division result
juncai
2017/01/11 00:12:50
Done.
|
| + scrollViewOriginX + |
| + (scrollViewWidth - adapterOffHelpButtonWidth - adapterOffMessageWidth) / |
| + 2; |
| + CGFloat adapterOffHelpButtonOriginY = |
| + scrollViewOriginY + (scrollViewHeight - adapterOffHelpButtonHeight) / 2; |
| [adapterOffHelpButton_ |
| setFrameOrigin:NSMakePoint(adapterOffHelpButtonOriginX, |
| adapterOffHelpButtonOriginY)]; |