Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: ash/shell/shell_main_parts_mac.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shell/shell_main_parts.h" 5 #include "ash/shell/shell_main_parts.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/i18n/icu_util.h" 9 #include "base/i18n/icu_util.h"
10 #include "base/mac/bundle_locations.h" 10 #include "base/mac/bundle_locations.h"
11 #include "base/memory/scoped_nsobject.h" 11 #include "base/mac/scoped_nsobject.h"
12 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/base/ui_base_paths.h" 13 #include "ui/base/ui_base_paths.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace shell { 16 namespace shell {
17 17
18 void PreMainMessageLoopStart() { 18 void PreMainMessageLoopStart() {
19 ui::RegisterPathProvider(); 19 ui::RegisterPathProvider();
20 icu_util::Initialize(); 20 icu_util::Initialize();
21 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 21 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
22 22
23 scoped_nsobject<NSNib> 23 base::scoped_nsobject<NSNib> nib(
24 nib([[NSNib alloc] initWithNibNamed:@"MainMenu" 24 [[NSNib alloc] initWithNibNamed:@"MainMenu"
25 bundle:base::mac::FrameworkBundle()]); 25 bundle:base::mac::FrameworkBundle()]);
26 [nib instantiateNibWithOwner:NSApp topLevelObjects:nil]; 26 [nib instantiateNibWithOwner:NSApp topLevelObjects:nil];
27 } 27 }
28 28
29 } // namespace shell 29 } // namespace shell
30 } // namespace ash 30 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/test/test_suite_init.mm » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698