| OLD | NEW |
| 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/memory/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"); | 21 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| 22 | 22 |
| 23 scoped_nsobject<NSNib> | 23 scoped_nsobject<NSNib> |
| 24 nib([[NSNib alloc] initWithNibNamed:@"MainMenu" | 24 nib([[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 |
| OLD | NEW |