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

Unified Diff: chrome/browser/ui/views/extensions/extension_message_bubble_view.cc

Issue 114883004: Add base:: namespace to straggling string16s left in chrome/browser/ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: found more 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/ui/views/extensions/extension_message_bubble_view.cc
diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
index 13a4ec15ae6427fca9311b52c3627d9d3a5cf8ce..c95dad7ffbadf56674de65dd309906ad7a1bd41e 100644
--- a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
@@ -238,10 +238,10 @@ void ExtensionMessageBubbleView::Init() {
extensions->SetMultiLine(true);
extensions->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- std::vector<string16> extension_list;
+ std::vector<base::string16> extension_list;
char16 bullet_point = 0x2022;
- std::vector<string16> suspicious = delegate_->GetExtensions();
+ std::vector<base::string16> suspicious = delegate_->GetExtensions();
size_t i = 0;
for (; i < suspicious.size() && i < kMaxExtensionsToShow; ++i) {
// Add each extension with bullet point.
@@ -250,7 +250,7 @@ void ExtensionMessageBubbleView::Init() {
}
if (i > kMaxExtensionsToShow) {
- string16 difference = base::IntToString16(i - kMaxExtensionsToShow);
+ base::string16 difference = base::IntToString16(i - kMaxExtensionsToShow);
extension_list.push_back(bullet_point + ASCIIToUTF16(" ") +
delegate_->GetOverflowText(difference));
}
@@ -261,7 +261,7 @@ void ExtensionMessageBubbleView::Init() {
layout->AddView(extensions);
}
- string16 action_button = delegate_->GetActionButtonLabel();
+ base::string16 action_button = delegate_->GetActionButtonLabel();
const int action_row_column_set_id = 3;
views::ColumnSet* bottom_columns =
« no previous file with comments | « chrome/browser/ui/search/search_tab_helper_unittest.cc ('k') | chrome/browser/ui/views/infobars/after_translate_infobar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698