diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 22:26:45 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 22:26:45 +0000 |
| commit | 3d2c6fb2b9f63f9be135751a011d68bb92bd7c3a (patch) | |
| tree | e399db957a94243d81a6aac7ff5afde407c58276 /ui | |
| parent | 83b5886a9084c85ecf279a06a604d68d999ea103 (diff) | |
| download | chromium_src-3d2c6fb2b9f63f9be135751a011d68bb92bd7c3a.zip chromium_src-3d2c6fb2b9f63f9be135751a011d68bb92bd7c3a.tar.gz chromium_src-3d2c6fb2b9f63f9be135751a011d68bb92bd7c3a.tar.bz2 | |
Move kLocalePak into ui/base/ from base/. Fixes component build of views_desktop.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7312010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/resource/resource_bundle_posix.cc | 2 | ||||
| -rw-r--r-- | ui/base/ui_base_switches.cc | 10 | ||||
| -rw-r--r-- | ui/base/ui_base_switches.h | 1 | ||||
| -rw-r--r-- | ui/ui_base.gypi | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/ui/base/resource/resource_bundle_posix.cc b/ui/base/resource/resource_bundle_posix.cc index c62983a1..1ad356c 100644 --- a/ui/base/resource/resource_bundle_posix.cc +++ b/ui/base/resource/resource_bundle_posix.cc @@ -4,7 +4,6 @@ #include "ui/base/resource/resource_bundle.h" -#include "base/base_switches.h" #include "base/command_line.h" #include "base/file_path.h" #include "base/logging.h" @@ -14,6 +13,7 @@ #include "base/synchronization/lock.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/data_pack.h" +#include "ui/base/ui_base_switches.h" #include "ui/gfx/font.h" namespace ui { diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc index 6a5b3a4..73a5606 100644 --- a/ui/base/ui_base_switches.cc +++ b/ui/base/ui_base_switches.cc @@ -1,6 +1,6 @@ -// Copyright (c) 2011 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. +// Copyright (c) 2011 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. #include "ui/base/ui_base_switches.h" @@ -10,4 +10,8 @@ namespace switches { // language[-country] where language is the 2 letter code from ISO-639. const char kLang[] = "lang"; +// Load the locale resources from the given path. When running on Mac/Unix the +// path should point to a locale.pak file. +const char kLocalePak[] = "locale_pak"; + } // namespace switches diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h index 22fc9fe..07ab98f 100644 --- a/ui/base/ui_base_switches.h +++ b/ui/base/ui_base_switches.h @@ -11,6 +11,7 @@ namespace switches { extern const char kLang[]; +extern const char kLocalePak[]; } // namespace switches diff --git a/ui/ui_base.gypi b/ui/ui_base.gypi index da4634b..985cb2e 100644 --- a/ui/ui_base.gypi +++ b/ui/ui_base.gypi @@ -154,8 +154,8 @@ 'base/win/hwnd_util.h', 'base/win/ime_input.cc', 'base/win/ime_input.h', - 'base/win/shell.cc', - 'base/win/shell.h', + 'base/win/shell.cc', + 'base/win/shell.h', 'base/win/window_impl.cc', 'base/win/window_impl.h', 'base/x/active_window_watcher_x.cc', |