summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/version_handler.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 17:51:49 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 17:51:49 +0000
commite9273e19ac50bb20ea9bdcb0a65935bbf5cdd545 (patch)
treeb7596ac00576f552970d869e48f0517448fa70e4 /chrome/browser/ui/webui/version_handler.cc
parent6463f823d8a7e915d2ae0f473aabe599c73fdc30 (diff)
downloadchromium_src-e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545.zip
chromium_src-e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545.tar.gz
chromium_src-e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545.tar.bz2
Replace some string16's with base namespace in chrome/browser
TBR=sky Review URL: https://codereview.chromium.org/101953005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/version_handler.cc')
-rw-r--r--chrome/browser/ui/webui/version_handler.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ui/webui/version_handler.cc b/chrome/browser/ui/webui/version_handler.cc
index b46de41..6074c10 100644
--- a/chrome/browser/ui/webui/version_handler.cc
+++ b/chrome/browser/ui/webui/version_handler.cc
@@ -23,8 +23,8 @@ namespace {
// Retrieves the executable and profile paths on the FILE thread.
void GetFilePaths(const base::FilePath& profile_path,
- string16* exec_path_out,
- string16* profile_path_out) {
+ base::string16* exec_path_out,
+ base::string16* profile_path_out) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
base::FilePath executable_path = base::MakeAbsoluteFilePath(
@@ -72,8 +72,8 @@ void VersionHandler::HandleRequestVersionInfo(const ListValue* args) {
// Grab the executable path on the FILE thread. It is returned in
// OnGotFilePaths.
- string16* exec_path_buffer = new string16;
- string16* profile_path_buffer = new string16;
+ base::string16* exec_path_buffer = new base::string16;
+ base::string16* profile_path_buffer = new base::string16;
content::BrowserThread::PostTaskAndReply(
content::BrowserThread::FILE, FROM_HERE,
base::Bind(&GetFilePaths, Profile::FromWebUI(web_ui())->GetPath(),
@@ -115,7 +115,7 @@ void VersionHandler::HandleRequestVersionInfo(const ListValue* args) {
}
void VersionHandler::OnGotFilePaths(string16* executable_path_data,
- string16* profile_path_data) {
+ base::string16* profile_path_data) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
StringValue exec_path(*executable_path_data);
@@ -130,7 +130,7 @@ void VersionHandler::OnGotPlugins(
std::vector<content::WebPluginInfo> info_array;
content::PluginService::GetInstance()->GetPluginInfoArray(
GURL(), content::kFlashPluginSwfMimeType, false, &info_array, NULL);
- string16 flash_version =
+ base::string16 flash_version =
l10n_util::GetStringUTF16(IDS_PLUGINS_DISABLED_PLUGIN);
PluginPrefs* plugin_prefs =
PluginPrefs::GetForProfile(Profile::FromWebUI(web_ui())).get();