Chromium Code Reviews| Index: ui/message_center/cocoa/notification_controller.mm |
| diff --git a/ui/message_center/cocoa/notification_controller.mm b/ui/message_center/cocoa/notification_controller.mm |
| index e10cf3716eef43bdb506e8ab732f49496b0bfc97..132ca0fe291ba973118f37b0971d46a87eebcdc3 100644 |
| --- a/ui/message_center/cocoa/notification_controller.mm |
| +++ b/ui/message_center/cocoa/notification_controller.mm |
| @@ -457,6 +457,7 @@ |
| maxNumberOfLines:message_center::kContextMessageLineLimit]; |
| [contextMessage_ setString:base::SysUTF16ToNSString(elided)]; |
| [contextMessage_ sizeToFit]; |
| + |
| NSRect contextMessageFrame = [contextMessage_ frame]; |
| if (notification->context_message().empty() && |
| @@ -473,6 +474,10 @@ |
| contextMessageFrame.size.height = NSHeight([contextMessage_ frame]); |
| } |
| + NSRect settingsButtonFrame; |
| + if (settingsButton_ != nil) |
|
Robert Sesek
2015/12/02 15:59:38
You can skip the nil check here and on 669, since
Miguel Garcia
2015/12/02 16:37:00
Wow I am starting to like this ObjC business :)
|
| + settingsButtonFrame = [settingsButton_ frame]; |
| + |
| // Create the list item views (up to a maximum). |
| [listView_ removeFromSuperview]; |
| NSRect listFrame = NSZeroRect; |
| @@ -661,6 +666,8 @@ |
| [title_ setFrame:titleFrame]; |
| [message_ setFrame:messageFrame]; |
| [contextMessage_ setFrame:contextMessageFrame]; |
| + if (settingsButton_ != nil) |
| + [settingsButton_ setFrame:settingsButtonFrame]; |
| [listView_ setFrame:listFrame]; |
| [progressBarView_ setFrame:progressBarFrame]; |