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

Unified Diff: ui/message_center/views/message_view.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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: ui/message_center/views/message_view.h
diff --git a/ui/message_center/views/message_view.h b/ui/message_center/views/message_view.h
index fc2b161703bd1c45f4a9ec0c8c73d7d9449c5182..a10a705ab620d20a71f03ddd184e817da7b6f1e6 100644
--- a/ui/message_center/views/message_view.h
+++ b/ui/message_center/views/message_view.h
@@ -48,7 +48,7 @@ class MESSAGE_CENTER_EXPORT MessageView : public views::SlideOutView,
MessageView(MessageViewController* controller,
const std::string& notification_id,
const NotifierId& notifier_id,
- const string16& display_source);
+ const base::string16& display_source);
virtual ~MessageView();
// Returns the insets for the shadow it will have for rich notification.
@@ -60,7 +60,9 @@ class MESSAGE_CENTER_EXPORT MessageView : public views::SlideOutView,
bool IsCloseButtonFocused();
void RequestFocusOnCloseButton();
- void set_accessible_name(const string16& name) { accessible_name_ = name; }
+ void set_accessible_name(const base::string16& accessible_name) {
+ accessible_name_ = accessible_name;
+ }
// Overridden from views::View:
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
@@ -99,7 +101,7 @@ class MESSAGE_CENTER_EXPORT MessageView : public views::SlideOutView,
scoped_ptr<views::ImageButton> close_button_;
views::ScrollView* scroller_;
- string16 accessible_name_;
+ base::string16 accessible_name_;
base::string16 display_source_;
« no previous file with comments | « ui/message_center/views/message_popup_collection_unittest.cc ('k') | ui/message_center/views/message_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698