diff options
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell/shell_main_parts_mac.mm | 8 | ||||
| -rw-r--r-- | ash/test/test_suite_init.mm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ash/shell/shell_main_parts_mac.mm b/ash/shell/shell_main_parts_mac.mm index d5c726e..292e1d5 100644 --- a/ash/shell/shell_main_parts_mac.mm +++ b/ash/shell/shell_main_parts_mac.mm @@ -8,7 +8,7 @@ #include "base/i18n/icu_util.h" #include "base/mac/bundle_locations.h" -#include "base/memory/scoped_nsobject.h" +#include "base/mac/scoped_nsobject.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" @@ -20,9 +20,9 @@ void PreMainMessageLoopStart() { icu_util::Initialize(); ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); - scoped_nsobject<NSNib> - nib([[NSNib alloc] initWithNibNamed:@"MainMenu" - bundle:base::mac::FrameworkBundle()]); + base::scoped_nsobject<NSNib> nib( + [[NSNib alloc] initWithNibNamed:@"MainMenu" + bundle:base::mac::FrameworkBundle()]); [nib instantiateNibWithOwner:NSApp topLevelObjects:nil]; } diff --git a/ash/test/test_suite_init.mm b/ash/test/test_suite_init.mm index 1564c38..0c8fd4a 100644 --- a/ash/test/test_suite_init.mm +++ b/ash/test/test_suite_init.mm @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/mac/bundle_locations.h" -#include "base/memory/scoped_nsobject.h" +#include "base/mac/scoped_nsobject.h" #include "base/path_service.h" namespace ash { |