diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:40:34 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:40:34 +0000 |
| commit | 6b32b95cff99ee72fd7824237ae5070263e5c496 (patch) | |
| tree | d495d8aad58d80673eae607d3d9ecbff5c293d82 | |
| parent | 812c94e95e09ff5582bbc401ecd137a39277a36f (diff) | |
| download | chromium_src-6b32b95cff99ee72fd7824237ae5070263e5c496.zip chromium_src-6b32b95cff99ee72fd7824237ae5070263e5c496.tar.gz chromium_src-6b32b95cff99ee72fd7824237ae5070263e5c496.tar.bz2 | |
Convert wide strings in extension_popup_api.cc and external_pref_extension_provider.cc.
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3135013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56039 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_popup_api.cc | 15 | ||||
| -rw-r--r-- | chrome/browser/extensions/external_pref_extension_provider.cc | 6 |
2 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/extensions/extension_popup_api.cc b/chrome/browser/extensions/extension_popup_api.cc index 855dfa1..615279d 100644 --- a/chrome/browser/extensions/extension_popup_api.cc +++ b/chrome/browser/extensions/extension_popup_api.cc @@ -48,14 +48,13 @@ const char kPopupsDisallowed[] = "Popups are only supported from tab-contents views."; // Keys. -const wchar_t kUrlKey[] = L"url"; -const wchar_t kWidthKey[] = L"width"; -const wchar_t kHeightKey[] = L"height"; -const wchar_t kTopKey[] = L"top"; -const wchar_t kLeftKey[] = L"left"; -const wchar_t kGiveFocusKey[] = L"giveFocus"; -const wchar_t kDomAnchorKey[] = L"domAnchor"; -const wchar_t kBorderStyleKey[] = L"borderStyle"; +const char kWidthKey[] = "width"; +const char kHeightKey[] = "height"; +const char kTopKey[] = "top"; +const char kLeftKey[] = "left"; +const char kGiveFocusKey[] = "giveFocus"; +const char kDomAnchorKey[] = "domAnchor"; +const char kBorderStyleKey[] = "borderStyle"; // chrome enumeration values const char kRectangleChrome[] = "rectangle"; diff --git a/chrome/browser/extensions/external_pref_extension_provider.cc b/chrome/browser/extensions/external_pref_extension_provider.cc index f5ffcb55..bd93a72 100644 --- a/chrome/browser/extensions/external_pref_extension_provider.cc +++ b/chrome/browser/extensions/external_pref_extension_provider.cc @@ -14,10 +14,8 @@ #include "chrome/common/json_value_serializer.h" // Constants for keeping track of extension preferences. -const wchar_t kLocation[] = L"location"; -const wchar_t kState[] = L"state"; -const wchar_t kExternalCrx[] = L"external_crx"; -const wchar_t kExternalVersion[] = L"external_version"; +const char kExternalCrx[] = "external_crx"; +const char kExternalVersion[] = "external_version"; ExternalPrefExtensionProvider::ExternalPrefExtensionProvider() { FilePath json_file; |