diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 07:59:08 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 07:59:08 +0000 |
| commit | a302ff0affd0d8a63acf872e740cd4e35ca379de (patch) | |
| tree | 7564ddadd22ca9670a9db36a679f1a3728f19663 /ui/base/l10n | |
| parent | 51c314d93e949d84cba31c471acf3e094148ce5a (diff) | |
| download | chromium_src-a302ff0affd0d8a63acf872e740cd4e35ca379de.zip chromium_src-a302ff0affd0d8a63acf872e740cd4e35ca379de.tar.gz chromium_src-a302ff0affd0d8a63acf872e740cd4e35ca379de.tar.bz2 | |
Transition to base/mac/bundle_locations.h step 3
Convert some instances of [NSBundle mainBundle] to equivalent calls in base/mac/bundle_locations.h
BUG=None
TEST=Code should compile and all unit tests should pass.
Review URL: http://codereview.chromium.org/9240004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/l10n')
| -rw-r--r-- | ui/base/l10n/l10n_util_mac.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/base/l10n/l10n_util_mac.mm b/ui/base/l10n/l10n_util_mac.mm index 2e40a8a..d2a1a1e 100644 --- a/ui/base/l10n/l10n_util_mac.mm +++ b/ui/base/l10n/l10n_util_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,6 +7,7 @@ #include "base/sys_string_conversions.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/mac/bundle_locations.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" @@ -44,7 +45,7 @@ void OverrideLocaleWithCocoaLocale() { // "Today" are in the same language as raw dates like "March 20, 1999" (Chrome // strings resources vs ICU generated strings). This also makes the Mac acts // like other Chrome platforms. - NSArray* languageList = [[NSBundle mainBundle] preferredLocalizations]; + NSArray* languageList = [base::mac::OuterBundle() preferredLocalizations]; NSString* firstLocale = [languageList objectAtIndex:0]; // Mac OS X uses "_" instead of "-", so swap to get a real locale value. std::string locale_value = |