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

Unified Diff: chrome_frame/chrome_tab.cc

Issue 113143006: Add base:: to string16 in chrome_frame/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | chrome_frame/find_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_tab.cc
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 2f22fbe8b6caffa2b7fa93565f4bc223f9cebd51..3c3c80a84a965934d8a8fc292cd7bbcba306703b 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -313,13 +313,13 @@ HRESULT RefreshElevationPolicy() {
HRESULT SetupRunOnce() {
HRESULT result = E_FAIL;
- string16 channel_name;
+ base::string16 channel_name;
if (base::win::GetVersion() < base::win::VERSION_VISTA &&
GoogleUpdateSettings::GetChromeChannelAndModifiers(true, &channel_name)) {
std::transform(channel_name.begin(), channel_name.end(),
channel_name.begin(), tolower);
// Use this only for the dev channel.
- if (channel_name.find(L"dev") != string16::npos) {
+ if (channel_name.find(L"dev") != base::string16::npos) {
HKEY hive = HKEY_CURRENT_USER;
if (IsSystemProcess()) {
// For system installs, our updates will be running as SYSTEM which
@@ -591,7 +591,7 @@ const wchar_t* const kMimeHandlerKeyValues[] = {
// Handlers key based on |for_installed|. Returns false if the values are not as
// expected or if an error occurred.
bool MimeHandlerKeyIsConfigured(bool for_install, HKEY root_key) {
- string16 key_name(kInternetSettings);
+ base::string16 key_name(kInternetSettings);
key_name.append(L"\\Secure Mime Handlers");
RegKey key(root_key, key_name.c_str(), KEY_QUERY_VALUE);
if (!key.Valid())
@@ -612,7 +612,7 @@ bool MimeHandlerKeyIsConfigured(bool for_install, HKEY root_key) {
}
HRESULT SetOrDeleteMimeHandlerKey(bool set, HKEY root_key) {
- string16 key_name(kInternetSettings);
+ base::string16 key_name(kInternetSettings);
key_name.append(L"\\Secure Mime Handlers");
RegKey key(root_key, key_name.c_str(), KEY_SET_VALUE);
if (!key.Valid())
« no previous file with comments | « no previous file | chrome_frame/find_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698