| Index: ui/message_center/cocoa/settings_controller.h
|
| diff --git a/ui/message_center/cocoa/settings_controller.h b/ui/message_center/cocoa/settings_controller.h
|
| index 1ae11c7a9657c5967f61a10ceda0195428bfea8c..2029f6b7a0e2d16e37bd8b886328c9850219ed82 100644
|
| --- a/ui/message_center/cocoa/settings_controller.h
|
| +++ b/ui/message_center/cocoa/settings_controller.h
|
| @@ -7,7 +7,7 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| -#import "base/memory/scoped_nsobject.h"
|
| +#import "base/mac/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "ui/message_center/message_center_export.h"
|
| #include "ui/message_center/notifier_settings.h"
|
| @@ -45,13 +45,13 @@ MESSAGE_CENTER_EXPORT
|
| message_center::NotifierSettingsProvider* provider_;
|
|
|
| // The "Settings" text at the top.
|
| - scoped_nsobject<NSTextField> settingsText_;
|
| + base::scoped_nsobject<NSTextField> settingsText_;
|
|
|
| // The smaller text below the "Settings" text.
|
| - scoped_nsobject<NSTextField> detailsText_;
|
| + base::scoped_nsobject<NSTextField> detailsText_;
|
|
|
| // Container for all the checkboxes.
|
| - scoped_nsobject<NSScrollView> scrollView_;
|
| + base::scoped_nsobject<NSScrollView> scrollView_;
|
|
|
| std::vector<message_center::Notifier*> notifiers_;
|
| }
|
|
|