summaryrefslogtreecommitdiffstats
path: root/remoting/host/policy_hack
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 01:32:58 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 01:32:58 +0000
commita11dbe9b75e6ec3e4fd8d9878526fa27426d59ad (patch)
treeabe85be335ec148e1d232be881033776c2c20f48 /remoting/host/policy_hack
parentcdd4234611a47a064a8b15c2f3a7f47676286cef (diff)
downloadchromium_src-a11dbe9b75e6ec3e4fd8d9878526fa27426d59ad.zip
chromium_src-a11dbe9b75e6ec3e4fd8d9878526fa27426d59ad.tar.gz
chromium_src-a11dbe9b75e6ec3e4fd8d9878526fa27426d59ad.tar.bz2
Cleaned up usage of std::wstring in src/remoting. Added presubmit warning supressions for the remaning instances because they depend on hard-to-change public APIs.
BUG=133003 Review URL: https://chromiumcodereview.appspot.com/10824166 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/policy_hack')
-rw-r--r--remoting/host/policy_hack/policy_watcher_win.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/host/policy_hack/policy_watcher_win.cc b/remoting/host/policy_hack/policy_watcher_win.cc
index fba75f0..a333911 100644
--- a/remoting/host/policy_hack/policy_watcher_win.cc
+++ b/remoting/host/policy_hack/policy_watcher_win.cc
@@ -114,7 +114,9 @@ class PolicyWatcherWin :
bool GetRegistryPolicyString(const std::string& value_name,
std::string* result) const {
+ // presubmit: allow wstring
std::wstring value_name_wide = UTF8ToWide(value_name);
+ // presubmit: allow wstring
std::wstring value;
RegKey policy_key(HKEY_LOCAL_MACHINE, kRegistrySubKey, KEY_READ);
if (policy_key.ReadValue(value_name_wide.c_str(), &value) ==
@@ -136,6 +138,7 @@ class PolicyWatcherWin :
bool GetRegistryPolicyInteger(const std::string& value_name,
uint32* result) const {
+ // presubmit: allow wstring
std::wstring value_name_wide = UTF8ToWide(value_name);
DWORD value = 0;
RegKey policy_key(HKEY_LOCAL_MACHINE, kRegistrySubKey, KEY_READ);