| Index: chrome/browser/ui/cocoa/tabs/tab_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm
|
| index 3e7924c48fd5d7363646d0a81af9d8f331c5a577..1006ef0beab9532ee76644d0acdf625c8e454ecc 100644
|
| --- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm
|
| @@ -102,7 +102,7 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
|
| // Label.
|
| titleView_.reset([[NSTextField alloc] initWithFrame:titleFrame]);
|
| [titleView_ setAutoresizingMask:NSViewWidthSizable];
|
| - scoped_nsobject<GTMFadeTruncatingTextFieldCell> labelCell(
|
| + base::scoped_nsobject<GTMFadeTruncatingTextFieldCell> labelCell(
|
| [[GTMFadeTruncatingTextFieldCell alloc] initTextCell:@"Label"]);
|
| [labelCell setControlSize:NSSmallControlSize];
|
| CGFloat fontSize = [NSFont systemFontSizeForControlSize:NSSmallControlSize];
|
| @@ -118,8 +118,10 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
|
| [closeButton_ setTarget:self];
|
| [closeButton_ setAction:@selector(closeTab:)];
|
|
|
| - scoped_nsobject<TabView> view([[TabView alloc] initWithFrame:
|
| - NSMakeRect(0, 0, 160, 25) controller:self closeButton:closeButton_]);
|
| + base::scoped_nsobject<TabView> view(
|
| + [[TabView alloc] initWithFrame:NSMakeRect(0, 0, 160, 25)
|
| + controller:self
|
| + closeButton:closeButton_]);
|
| [view setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin];
|
| [view addSubview:iconView_];
|
| [view addSubview:titleView_];
|
|
|