diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 22:18:25 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 22:18:25 +0000 |
| commit | 6235541680600aecf07e7e85a63dc0843f1b7084 (patch) | |
| tree | 76304d95b2638e9aa3eebfd5db6b2f2198e4da5d /chrome/browser/policy | |
| parent | fd4aafc80ad6b4fc7dcbbe36dfec3b7e1bcbd707 (diff) | |
| download | chromium_src-6235541680600aecf07e7e85a63dc0843f1b7084.zip chromium_src-6235541680600aecf07e7e85a63dc0843f1b7084.tar.gz chromium_src-6235541680600aecf07e7e85a63dc0843f1b7084.tar.bz2 | |
Revert 71485 - Remove wstring from TemplateURL and friends.
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6322001
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6291003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
| -rw-r--r-- | chrome/browser/policy/configuration_policy_pref_store.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index 1ff956c..58b5cac 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -424,8 +424,8 @@ class SearchTermsDataForValidation : public SearchTermsData { return "en"; } #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD) - virtual string16 GetRlzParameterValue() const { - return string16(); + virtual std::wstring GetRlzParameterValue() const { + return std::wstring(); } #endif private: |