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

Unified Diff: chrome/common/importer/firefox_importer_utils.cc

Issue 105473003: Add explicit base namespace to string16 users. (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
Index: chrome/common/importer/firefox_importer_utils.cc
diff --git a/chrome/common/importer/firefox_importer_utils.cc b/chrome/common/importer/firefox_importer_utils.cc
index bf34de0e36654f04923286daa3e43693af6856ee..4f6a2019e781551b516cdde924b5aca31f755e1e 100644
--- a/chrome/common/importer/firefox_importer_utils.cc
+++ b/chrome/common/importer/firefox_importer_utils.cc
@@ -25,7 +25,7 @@ namespace {
// Retrieves the file system path of the profile name.
base::FilePath GetProfilePath(const DictionaryValue& root,
const std::string& profile_name) {
- string16 path16;
+ base::string16 path16;
std::string is_relative;
if (!root.GetStringASCII(profile_name + ".IsRelative", &is_relative) ||
!root.GetString(profile_name + ".Path", &path16))
@@ -253,7 +253,7 @@ std::string GetPrefsJsValue(const std::string& content,
// ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
// .........................................
// In this example the function returns "Iceweasel" (or a localized equivalent).
-string16 GetFirefoxImporterName(const base::FilePath& app_path) {
+base::string16 GetFirefoxImporterName(const base::FilePath& app_path) {
const base::FilePath app_ini_file = app_path.AppendASCII("application.ini");
std::string branding_name;
if (base::PathExists(app_ini_file)) {
« no previous file with comments | « chrome/common/importer/firefox_importer_utils.h ('k') | chrome/common/importer/firefox_importer_utils_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698