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

Unified Diff: chrome/browser/automation/testing_automation_provider_chromeos.cc

Issue 105193002: Replace string16 with base::string16. (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/browser/automation/testing_automation_provider_chromeos.cc
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index 3491c7c704346108130d1bc743f6a145a0fde70f..23ba9416e324c83933935a987c40bb14f3a61e80 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -513,9 +513,9 @@ void TestingAutomationProvider::GetTimeInfo(Browser* browser,
prefs::kUse24HourClock);
base::HourClockType hour_clock_type =
use_24hour_clock ? base::k24HourClock : base::k12HourClock;
- string16 display_time = base::TimeFormatTimeOfDayWithHourClockType(
+ base::string16 display_time = base::TimeFormatTimeOfDayWithHourClockType(
time, hour_clock_type, base::kDropAmPm);
- string16 timezone =
+ base::string16 timezone =
chromeos::system::TimezoneSettings::GetInstance()->GetCurrentTimezoneID();
return_value->SetString("display_time", display_time);
return_value->SetString("display_date", base::TimeFormatFriendlyDate(time));

Powered by Google App Engine
This is Rietveld 408576698