diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 02:45:23 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 02:45:23 +0000 |
commit | 671b7ab28cfac6fb097bf3486ef8ad9774ab1423 (patch) | |
tree | 8e48e7fcd80145ed974479bca8a1c33da2f4eeb5 /chrome | |
parent | 59fffe5ef6ecaa291f574916f07e412fa90b027b (diff) | |
download | chromium_src-671b7ab28cfac6fb097bf3486ef8ad9774ab1423.zip chromium_src-671b7ab28cfac6fb097bf3486ef8ad9774ab1423.tar.gz chromium_src-671b7ab28cfac6fb097bf3486ef8ad9774ab1423.tar.bz2 |
Convert wide strings in extension_idle_api_constants and extension_infobar_module_constants.
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3160011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
5 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/extensions/extension_idle_api.cc b/chrome/browser/extensions/extension_idle_api.cc index 0a6a25f..104cc8b 100644 --- a/chrome/browser/extensions/extension_idle_api.cc +++ b/chrome/browser/extensions/extension_idle_api.cc @@ -42,7 +42,7 @@ struct ExtensionIdlePollingData { static ExtensionIdlePollingData polling_data; // Forward declaration of utility methods. -static const wchar_t* IdleStateToDescription(IdleState state); +static const char* IdleStateToDescription(IdleState state); static StringValue* CreateIdleValue(IdleState idle_state); static int CheckThresholdBounds(int timeout); static IdleState CalculateIdleStateAndUpdateTimestamp(int threshold); @@ -64,7 +64,7 @@ class ExtensionIdlePollingTask : public Task { DISALLOW_COPY_AND_ASSIGN(ExtensionIdlePollingTask); }; -const wchar_t* IdleStateToDescription(IdleState state) { +const char* IdleStateToDescription(IdleState state) { if (IDLE_STATE_ACTIVE == state) return keys::kStateActive; if (IDLE_STATE_IDLE == state) diff --git a/chrome/browser/extensions/extension_idle_api_constants.cc b/chrome/browser/extensions/extension_idle_api_constants.cc index cf0c8e78..f9087b2 100644 --- a/chrome/browser/extensions/extension_idle_api_constants.cc +++ b/chrome/browser/extensions/extension_idle_api_constants.cc @@ -6,13 +6,13 @@ namespace extension_idle_api_constants { -const wchar_t kSecondsKey[] = L"seconds"; -const wchar_t kStateKey[] = L"state"; +const char kSecondsKey[] = "seconds"; +const char kStateKey[] = "state"; const char kOnStateChanged[] = "idle.onStateChanged"; -const wchar_t kStateActive[] = L"active"; -const wchar_t kStateIdle[] = L"idle"; -const wchar_t kStateLocked[] = L"locked"; +const char kStateActive[] = "active"; +const char kStateIdle[] = "idle"; +const char kStateLocked[] = "locked"; } // namespace extension_idle_api_constants diff --git a/chrome/browser/extensions/extension_idle_api_constants.h b/chrome/browser/extensions/extension_idle_api_constants.h index f189377..ae5ff8e 100644 --- a/chrome/browser/extensions/extension_idle_api_constants.h +++ b/chrome/browser/extensions/extension_idle_api_constants.h @@ -9,16 +9,16 @@ namespace extension_idle_api_constants { // Keys. -extern const wchar_t kSecondsKey[]; -extern const wchar_t kStateKey[]; +extern const char kSecondsKey[]; +extern const char kStateKey[]; // Events. extern const char kOnStateChanged[]; // States -extern const wchar_t kStateActive[]; -extern const wchar_t kStateIdle[]; -extern const wchar_t kStateLocked[]; +extern const char kStateActive[]; +extern const char kStateIdle[]; +extern const char kStateLocked[]; }; // namespace extension_idle_api_constants diff --git a/chrome/browser/extensions/extension_infobar_module_constants.cc b/chrome/browser/extensions/extension_infobar_module_constants.cc index 1b0eef9..6897ded 100644 --- a/chrome/browser/extensions/extension_infobar_module_constants.cc +++ b/chrome/browser/extensions/extension_infobar_module_constants.cc @@ -6,8 +6,8 @@ namespace extension_infobar_module_constants { -const wchar_t kHtmlPath[] = L"path"; -const wchar_t kTabId[] = L"tabId"; +const char kHtmlPath[] = "path"; +const char kTabId[] = "tabId"; const char kNoCurrentWindowError[] = "No current browser window was found"; const char kTabNotFoundError[] = "Specified tab (or default tab) not found"; diff --git a/chrome/browser/extensions/extension_infobar_module_constants.h b/chrome/browser/extensions/extension_infobar_module_constants.h index 7d5e6fd..6f4ff48 100644 --- a/chrome/browser/extensions/extension_infobar_module_constants.h +++ b/chrome/browser/extensions/extension_infobar_module_constants.h @@ -11,8 +11,8 @@ namespace extension_infobar_module_constants { // Keys. -extern const wchar_t kHtmlPath[]; -extern const wchar_t kTabId[]; +extern const char kHtmlPath[]; +extern const char kTabId[]; // Errors. extern const char kNoCurrentWindowError[]; |