summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-19 18:56:32 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-19 18:56:32 +0000
commit74af533ebcc87e092963acf3f013812facb759f5 (patch)
tree27454f9696a8ccc63563ff53de26ac49a368d52f
parente96e34372428b9e0f0d76382b02c62c123ee00a5 (diff)
downloadchromium_src-74af533ebcc87e092963acf3f013812facb759f5.zip
chromium_src-74af533ebcc87e092963acf3f013812facb759f5.tar.gz
chromium_src-74af533ebcc87e092963acf3f013812facb759f5.tar.bz2
Prefix string16 with base:: in ash/.
R=sky@chromium.org BUG=329295 Review URL: https://codereview.chromium.org/118903002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241898 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ash/accelerators/exit_warning_handler.cc2
-rw-r--r--ash/display/display_error_observer_chromeos.cc3
-rw-r--r--ash/system/chromeos/audio/tray_audio.cc4
-rw-r--r--ash/system/chromeos/managed/tray_locally_managed_user.cc2
-rw-r--r--ash/system/chromeos/network/network_connect.cc4
-rw-r--r--ash/system/chromeos/network/network_state_notifier.cc10
-rw-r--r--ash/system/chromeos/tray_display_unittest.cc2
-rw-r--r--ash/system/tray/default_system_tray_delegate.cc6
-rw-r--r--ash/test/test_metro_viewer_process_host.cc4
-rw-r--r--ash/test/test_metro_viewer_process_host.h5
-rw-r--r--ash/touch/touch_hud_debug.cc2
11 files changed, 23 insertions, 21 deletions
diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc
index 776068e..6c873c3 100644
--- a/ash/accelerators/exit_warning_handler.cc
+++ b/ash/accelerators/exit_warning_handler.cc
@@ -45,7 +45,7 @@ class ExitWarningLabel : public views::Label {
private:
virtual void PaintText(gfx::Canvas* canvas,
- const string16& text,
+ const base::string16& text,
const gfx::Rect& text_bounds,
int flags) OVERRIDE {
// Turn off subpixel rendering.
diff --git a/ash/display/display_error_observer_chromeos.cc b/ash/display/display_error_observer_chromeos.cc
index 34e1bc2e..f09a841 100644
--- a/ash/display/display_error_observer_chromeos.cc
+++ b/ash/display/display_error_observer_chromeos.cc
@@ -57,7 +57,8 @@ void DisplayErrorObserver::OnDisplayModeChangeFailed(
message_center::MessageCenter::Get()->AddNotification(notification.Pass());
}
-string16 DisplayErrorObserver::GetTitleOfDisplayErrorNotificationForTest() {
+base::string16 DisplayErrorObserver::
+ GetTitleOfDisplayErrorNotificationForTest() {
message_center::NotificationList::Notifications notifications =
message_center::MessageCenter::Get()->GetVisibleNotifications();
for (message_center::NotificationList::Notifications::const_iterator iter =
diff --git a/ash/system/chromeos/audio/tray_audio.cc b/ash/system/chromeos/audio/tray_audio.cc
index 3dbd815..67f7886 100644
--- a/ash/system/chromeos/audio/tray_audio.cc
+++ b/ash/system/chromeos/audio/tray_audio.cc
@@ -486,7 +486,7 @@ class AudioDetailedView : public TrayDetailsView,
scroller()->Layout();
}
- void AddScrollListInfoItem(const string16& text) {
+ void AddScrollListInfoItem(const base::string16& text) {
views::Label* label = new views::Label(text);
// Align info item with checkbox items
@@ -511,7 +511,7 @@ class AudioDetailedView : public TrayDetailsView,
scroll_content()->AddChildView(label);
}
- HoverHighlightView* AddScrollListItem(const string16& text,
+ HoverHighlightView* AddScrollListItem(const base::string16& text,
gfx::Font::FontStyle style,
bool checked) {
HoverHighlightView* container = new HoverHighlightView(this);
diff --git a/ash/system/chromeos/managed/tray_locally_managed_user.cc b/ash/system/chromeos/managed/tray_locally_managed_user.cc
index bd3e380..e9f44a5 100644
--- a/ash/system/chromeos/managed/tray_locally_managed_user.cc
+++ b/ash/system/chromeos/managed/tray_locally_managed_user.cc
@@ -81,7 +81,7 @@ void TrayLocallyManagedUser::CreateOrUpdateNotification(
scoped_ptr<Notification> notification(
message_center::Notification::CreateSystemNotification(
kNotificationId,
- string16() /* no title */,
+ base::string16() /* no title */,
new_message,
bundle.GetImageNamed(IDR_AURA_UBER_TRAY_MANAGED_USER),
system_notifier::kNotifierLocallyManagedUser,
diff --git a/ash/system/chromeos/network/network_connect.cc b/ash/system/chromeos/network/network_connect.cc
index d8f524a..81f8f83 100644
--- a/ash/system/chromeos/network/network_connect.cc
+++ b/ash/system/chromeos/network/network_connect.cc
@@ -486,10 +486,10 @@ void CreateConfigurationAndConnect(base::DictionaryValue* properties,
base::Bind(&OnConfigureFailed));
}
-string16 ErrorString(const std::string& error,
+base::string16 ErrorString(const std::string& error,
const std::string& service_path) {
if (error.empty())
- return string16();
+ return base::string16();
if (error == shill::kErrorOutOfRange)
return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_OUT_OF_RANGE);
if (error == shill::kErrorPinMissing)
diff --git a/ash/system/chromeos/network/network_state_notifier.cc b/ash/system/chromeos/network/network_state_notifier.cc
index ac69a8a..79a5d5b 100644
--- a/ash/system/chromeos/network/network_state_notifier.cc
+++ b/ash/system/chromeos/network/network_state_notifier.cc
@@ -39,7 +39,7 @@ const char kNetworkOutOfCreditsNotificationId[] =
const int kMinTimeBetweenOutOfCreditsNotifySeconds = 10 * 60;
// Error messages based on |error_name|, not network_state->error().
-string16 GetConnectErrorString(const std::string& error_name) {
+base::string16 GetConnectErrorString(const std::string& error_name) {
if (error_name == NetworkConnectionHandler::kErrorNotFound)
return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_CONNECT_FAILED);
if (error_name == NetworkConnectionHandler::kErrorConfigureFailed)
@@ -48,7 +48,7 @@ string16 GetConnectErrorString(const std::string& error_name) {
if (error_name == ash::network_connect::kErrorActivateFailed)
return l10n_util::GetStringUTF16(
IDS_CHROMEOS_NETWORK_ERROR_ACTIVATION_FAILED);
- return string16();
+ return base::string16();
}
void ShowErrorNotification(const std::string& notification_id,
@@ -143,7 +143,7 @@ void NetworkStateNotifier::UpdateCellularOutOfCredits(
base::TimeDelta dtime = base::Time::Now() - out_of_credits_notify_time_;
if (dtime.InSeconds() > kMinTimeBetweenOutOfCreditsNotifySeconds) {
out_of_credits_notify_time_ = base::Time::Now();
- string16 error_msg = l10n_util::GetStringFUTF16(
+ base::string16 error_msg = l10n_util::GetStringFUTF16(
IDS_NETWORK_OUT_OF_CREDITS_BODY,
UTF8ToUTF16(cellular->name()));
ShowErrorNotification(
@@ -234,7 +234,7 @@ void NetworkStateNotifier::ShowConnectErrorNotification(
const std::string& shill_error,
const std::string& service_path,
const base::DictionaryValue& shill_properties) {
- string16 error = GetConnectErrorString(error_name);
+ base::string16 error = GetConnectErrorString(error_name);
if (error.empty()) {
// Service.Error gets cleared shortly after State transitions to Failure,
// so rely on |shill_error| unless empty.
@@ -257,7 +257,7 @@ void NetworkStateNotifier::ShowConnectErrorNotification(
shill_properties.GetStringWithoutPathExpansion(
shill::kErrorDetailsProperty, &network_error_details);
- string16 error_msg;
+ base::string16 error_msg;
if (!network_error_details.empty()) {
// network_name should't be empty if network_error_details is set.
error_msg = l10n_util::GetStringFUTF16(
diff --git a/ash/system/chromeos/tray_display_unittest.cc b/ash/system/chromeos/tray_display_unittest.cc
index 8884da8..921ff7e 100644
--- a/ash/system/chromeos/tray_display_unittest.cc
+++ b/ash/system/chromeos/tray_display_unittest.cc
@@ -200,7 +200,7 @@ TEST_F(TrayDisplayTest, InternalDisplay) {
// Extended
UpdateDisplay("400x400,200x200");
- string16 expected = l10n_util::GetStringFUTF16(
+ base::string16 expected = l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED, GetSecondDisplayName());
tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
EXPECT_TRUE(IsDisplayVisibleInTray());
diff --git a/ash/system/tray/default_system_tray_delegate.cc b/ash/system/tray/default_system_tray_delegate.cc
index 37836f0..ef51585d 100644
--- a/ash/system/tray/default_system_tray_delegate.cc
+++ b/ash/system/tray/default_system_tray_delegate.cc
@@ -71,7 +71,7 @@ const std::string DefaultSystemTrayDelegate::GetEnterpriseDomain() const {
}
const base::string16 DefaultSystemTrayDelegate::GetEnterpriseMessage() const {
- return string16();
+ return base::string16();
}
const std::string
@@ -82,12 +82,12 @@ DefaultSystemTrayDelegate::GetLocallyManagedUserManager() const {
const base::string16
DefaultSystemTrayDelegate::GetLocallyManagedUserManagerName()
const {
- return string16();
+ return base::string16();
}
const base::string16 DefaultSystemTrayDelegate::GetLocallyManagedUserMessage()
const {
- return string16();
+ return base::string16();
}
bool DefaultSystemTrayDelegate::SystemShouldUpgrade() const {
diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc
index a5e3fbf..4af0c58 100644
--- a/ash/test/test_metro_viewer_process_host.cc
+++ b/ash/test/test_metro_viewer_process_host.cc
@@ -35,11 +35,11 @@ void TestMetroViewerProcessHost::OnSetTargetSurface(
backing_surface_.reset(new AcceleratedSurface(hwnd));
}
-void TestMetroViewerProcessHost::OnOpenURL(const string16& url) {
+void TestMetroViewerProcessHost::OnOpenURL(const base::string16& url) {
}
void TestMetroViewerProcessHost::OnHandleSearchRequest(
- const string16& search_string) {
+ const base::string16& search_string) {
}
void TestMetroViewerProcessHost::OnWindowSizeChanged(uint32 width,
diff --git a/ash/test/test_metro_viewer_process_host.h b/ash/test/test_metro_viewer_process_host.h
index 7c3770e..fca5744 100644
--- a/ash/test/test_metro_viewer_process_host.h
+++ b/ash/test/test_metro_viewer_process_host.h
@@ -24,8 +24,9 @@ class TestMetroViewerProcessHost : public win8::MetroViewerProcessHost {
// win8::MetroViewerProcessHost implementation
virtual void OnChannelError() OVERRIDE;
virtual void OnSetTargetSurface(gfx::NativeViewId target_surface) OVERRIDE;
- virtual void OnOpenURL(const string16& url) OVERRIDE;
- virtual void OnHandleSearchRequest(const string16& search_string) OVERRIDE;
+ virtual void OnOpenURL(const base::string16& url) OVERRIDE;
+ virtual void OnHandleSearchRequest(
+ const base::string16& search_string) OVERRIDE;
virtual void OnWindowSizeChanged(uint32 width, uint32 height) OVERRIDE;
scoped_ptr<AcceleratedSurface> backing_surface_;
diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc
index 32392ff..d0c7c9b 100644
--- a/ash/touch/touch_hud_debug.cc
+++ b/ash/touch/touch_hud_debug.cc
@@ -407,7 +407,7 @@ void TouchHudDebug::Clear() {
if (widget()->IsVisible()) {
canvas_->Clear();
for (int i = 0; i < kMaxTouchPoints; ++i)
- touch_labels_[i]->SetText(string16());
+ touch_labels_[i]->SetText(base::string16());
label_container_->SetSize(label_container_->GetPreferredSize());
}
}