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

Unified Diff: chrome/installer/util/google_update_settings.cc

Issue 8909009: Remove remaining references to CEEE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Sync'ed, no new changes Created 9 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
Index: chrome/installer/util/google_update_settings.cc
===================================================================
--- chrome/installer/util/google_update_settings.cc (revision 115109)
+++ chrome/installer/util/google_update_settings.cc (working copy)
@@ -123,14 +123,14 @@
bool GetChromeChannelInternal(bool system_install,
bool add_multi_modifier,
- std::wstring* channel) {
+ string16* channel) {
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
if (dist->GetChromeChannel(channel)) {
return true;
}
HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
- std::wstring reg_path = dist->GetStateKey();
+ string16 reg_path = dist->GetStateKey();
RegKey key(root_key, reg_path.c_str(), KEY_READ);
installer::ChannelInfo channel_info;
@@ -376,7 +376,7 @@
}
bool GoogleUpdateSettings::GetChromeChannelAndModifiers(bool system_install,
- std::wstring* channel) {
+ string16* channel) {
return GetChromeChannelInternal(system_install, true, channel);
}
« no previous file with comments | « chrome/installer/util/google_update_settings.h ('k') | chrome/installer/util/google_update_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698