summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/flash_ui.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 20:58:48 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 20:58:48 +0000
commit7a8edafc2e81f88a1f8e699f1bb17662b23cb6af (patch)
treebb0cfe6a38502a914e6fbcc80338b05095e8d6ee /chrome/browser/ui/webui/flash_ui.cc
parent8faf9ba57ca3abbc5dd35d047097aed237d02d5e (diff)
downloadchromium_src-7a8edafc2e81f88a1f8e699f1bb17662b23cb6af.zip
chromium_src-7a8edafc2e81f88a1f8e699f1bb17662b23cb6af.tar.gz
chromium_src-7a8edafc2e81f88a1f8e699f1bb17662b23cb6af.tar.bz2
Cleanup: Convert ASCIIToUTF16("") to string16().
Inspired by r111713. BUG=none TEST=none R=gbillock@chromium.org Review URL: http://codereview.chromium.org/8687002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/flash_ui.cc')
-rw-r--r--chrome/browser/ui/webui/flash_ui.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc
index 4f9b238..1bf0cd3 100644
--- a/chrome/browser/ui/webui/flash_ui.cc
+++ b/chrome/browser/ui/webui/flash_ui.cc
@@ -12,6 +12,7 @@
#include "base/bind_helpers.h"
#include "base/i18n/time_formatting.h"
#include "base/memory/weak_ptr.h"
+#include "base/string16.h"
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/threading/thread_restrictions.h"
@@ -276,7 +277,7 @@ void FlashDOMHandler::MaybeRespondToPage() {
}
// Crash information.
- AddPair(list, ASCIIToUTF16(""), "--- Crash data ---");
+ AddPair(list, string16(), "--- Crash data ---");
bool crash_reporting_enabled = CrashesUI::CrashReportingEnabled();
if (crash_reporting_enabled) {
std::vector<CrashUploadList::CrashInfo> crashes;
@@ -297,7 +298,7 @@ void FlashDOMHandler::MaybeRespondToPage() {
}
// GPU information.
- AddPair(list, ASCIIToUTF16(""), "--- GPU information ---");
+ AddPair(list, string16(), "--- GPU information ---");
const content::GPUInfo& gpu_info = gpu_data_manager_->gpu_info();
if (!gpu_data_manager_->GpuAccessAllowed())
@@ -325,7 +326,7 @@ void FlashDOMHandler::MaybeRespondToPage() {
}
#endif
- AddPair(list, ASCIIToUTF16(""), "--- GPU driver, more information ---");
+ AddPair(list, string16(), "--- GPU driver, more information ---");
AddPair(list,
ASCIIToUTF16("Vendor Id"),
base::StringPrintf("0x%04x", gpu_info.vendor_id));