Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Unified Diff: win8/delegate_execute/chrome_util.cc

Issue 119733002: Add base:: to string16s in win8/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | win8/delegate_execute/command_execute_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win8/delegate_execute/chrome_util.cc
diff --git a/win8/delegate_execute/chrome_util.cc b/win8/delegate_execute/chrome_util.cc
index 3695b3331fbb15834477be3de5c61d1c327f8e16..89d869d361cd150a0b928f63dbe0c0271169a366 100644
--- a/win8/delegate_execute/chrome_util.cc
+++ b/win8/delegate_execute/chrome_util.cc
@@ -45,10 +45,10 @@ const wchar_t kRegPathChromeClientBase[] =
// use by a browser process.
// TODO(grt): Move this somewhere central so it can be used by both this
// IsBrowserRunning (below) and IsBrowserAlreadyRunning (browser_util_win.cc).
-string16 GetEventName(const base::FilePath& chrome_exe) {
+base::string16 GetEventName(const base::FilePath& chrome_exe) {
static wchar_t const kEventPrefix[] = L"Global\\";
const size_t prefix_len = arraysize(kEventPrefix) - 1;
- string16 name;
+ base::string16 name;
name.reserve(prefix_len + chrome_exe.value().size());
name.assign(kEventPrefix, prefix_len);
name.append(chrome_exe.value());
@@ -80,10 +80,10 @@ bool NewChromeExeExists(const base::FilePath& chrome_exe) {
return base::PathExists(new_chrome_exe);
}
-bool GetUpdateCommand(bool is_per_user, string16* update_command) {
+bool GetUpdateCommand(bool is_per_user, base::string16* update_command) {
const HKEY root = is_per_user ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
- string16 reg_path_chrome_client = kRegPathChromeClientBase;
+ base::string16 reg_path_chrome_client = kRegPathChromeClientBase;
reg_path_chrome_client.append(dist->GetAppGuid());
base::win::RegKey key(root, reg_path_chrome_client.c_str(), KEY_QUERY_VALUE);
@@ -107,7 +107,7 @@ void UpdateChromeIfNeeded(const base::FilePath& chrome_exe) {
if (InstallUtil::IsPerUserInstall(chrome_exe.value().c_str())) {
// Read the update command from the registry.
- string16 update_command;
+ base::string16 update_command;
if (!GetUpdateCommand(true, &update_command)) {
AtlTrace("%hs. Failed to read update command from registry.\n",
__FUNCTION__);
« no previous file with comments | « no previous file | win8/delegate_execute/command_execute_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698