From ed95e02da69e469de255362cdb4114fe8e4c0c64 Mon Sep 17 00:00:00 2001
From: "brettw@chromium.org"
<brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 11 Apr 2013 04:03:32 +0000
Subject: Update src/ash/ for renames and moves in base
Renames string16 -> base::string16 and
base/string_number_conversions.h -> base/strings/string_number_conversions.h
BUG=
Review URL: https://codereview.chromium.org/13856005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193561 0039d316-1c4b-4281-b951-d872f2087c98
---
ash/shell/bubble.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'ash/shell/bubble.cc')
diff --git a/ash/shell/bubble.cc b/ash/shell/bubble.cc
index 649202d..fa2583e 100644
--- a/ash/shell/bubble.cc
+++ b/ash/shell/bubble.cc
@@ -13,7 +13,7 @@ namespace ash {
namespace shell {
struct BubbleConfig {
- string16 label;
+ base::string16 label;
views::View* anchor_view;
views::BubbleBorder::ArrowLocation arrow;
};
@@ -31,7 +31,7 @@ class ExampleBubbleDelegateView : public views::BubbleDelegateView {
}
private:
- string16 label_;
+ base::string16 label_;
};
void CreatePointyBubble(views::View* anchor_view) {
--
cgit v1.1