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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" 5 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h"
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/extensions/dev_mode_bubble_controller.h" 10 #include "chrome/browser/extensions/dev_mode_bubble_controller.h"
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 middle_columns->AddColumn( 231 middle_columns->AddColumn(
232 views::GridLayout::LEADING, views::GridLayout::CENTER, 232 views::GridLayout::LEADING, views::GridLayout::CENTER,
233 0, views::GridLayout::USE_PREF, 0, 0); 233 0, views::GridLayout::USE_PREF, 0, 0);
234 234
235 layout->StartRowWithPadding(0, extension_list_column_set_id, 235 layout->StartRowWithPadding(0, extension_list_column_set_id,
236 0, kHeadlineMessagePadding); 236 0, kHeadlineMessagePadding);
237 views::Label* extensions = new views::Label(); 237 views::Label* extensions = new views::Label();
238 extensions->SetMultiLine(true); 238 extensions->SetMultiLine(true);
239 extensions->SetHorizontalAlignment(gfx::ALIGN_LEFT); 239 extensions->SetHorizontalAlignment(gfx::ALIGN_LEFT);
240 240
241 std::vector<string16> extension_list; 241 std::vector<base::string16> extension_list;
242 char16 bullet_point = 0x2022; 242 char16 bullet_point = 0x2022;
243 243
244 std::vector<string16> suspicious = delegate_->GetExtensions(); 244 std::vector<base::string16> suspicious = delegate_->GetExtensions();
245 size_t i = 0; 245 size_t i = 0;
246 for (; i < suspicious.size() && i < kMaxExtensionsToShow; ++i) { 246 for (; i < suspicious.size() && i < kMaxExtensionsToShow; ++i) {
247 // Add each extension with bullet point. 247 // Add each extension with bullet point.
248 extension_list.push_back( 248 extension_list.push_back(
249 bullet_point + ASCIIToUTF16(" ") + suspicious[i]); 249 bullet_point + ASCIIToUTF16(" ") + suspicious[i]);
250 } 250 }
251 251
252 if (i > kMaxExtensionsToShow) { 252 if (i > kMaxExtensionsToShow) {
253 string16 difference = base::IntToString16(i - kMaxExtensionsToShow); 253 base::string16 difference = base::IntToString16(i - kMaxExtensionsToShow);
254 extension_list.push_back(bullet_point + ASCIIToUTF16(" ") + 254 extension_list.push_back(bullet_point + ASCIIToUTF16(" ") +
255 delegate_->GetOverflowText(difference)); 255 delegate_->GetOverflowText(difference));
256 } 256 }
257 257
258 extensions->SetText(JoinString(extension_list, ASCIIToUTF16("\n"))); 258 extensions->SetText(JoinString(extension_list, ASCIIToUTF16("\n")));
259 extensions->SizeToFit(views::Widget::GetLocalizedContentsWidth( 259 extensions->SizeToFit(views::Widget::GetLocalizedContentsWidth(
260 IDS_EXTENSION_WIPEOUT_BUBBLE_WIDTH_CHARS)); 260 IDS_EXTENSION_WIPEOUT_BUBBLE_WIDTH_CHARS));
261 layout->AddView(extensions); 261 layout->AddView(extensions);
262 } 262 }
263 263
264 string16 action_button = delegate_->GetActionButtonLabel(); 264 base::string16 action_button = delegate_->GetActionButtonLabel();
265 265
266 const int action_row_column_set_id = 3; 266 const int action_row_column_set_id = 3;
267 views::ColumnSet* bottom_columns = 267 views::ColumnSet* bottom_columns =
268 layout->AddColumnSet(action_row_column_set_id); 268 layout->AddColumnSet(action_row_column_set_id);
269 bottom_columns->AddColumn(views::GridLayout::LEADING, 269 bottom_columns->AddColumn(views::GridLayout::LEADING,
270 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); 270 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
271 bottom_columns->AddPaddingColumn(1, 0); 271 bottom_columns->AddPaddingColumn(1, 0);
272 bottom_columns->AddColumn(views::GridLayout::TRAILING, 272 bottom_columns->AddColumn(views::GridLayout::TRAILING,
273 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); 273 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
274 if (!action_button.empty()) { 274 if (!action_button.empty()) {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 state->role = ui::AccessibilityTypes::ROLE_ALERT; 318 state->role = ui::AccessibilityTypes::ROLE_ALERT;
319 } 319 }
320 320
321 void ExtensionMessageBubbleView::ViewHierarchyChanged( 321 void ExtensionMessageBubbleView::ViewHierarchyChanged(
322 const ViewHierarchyChangedDetails& details) { 322 const ViewHierarchyChangedDetails& details) {
323 if (details.is_add && details.child == this) 323 if (details.is_add && details.child == this)
324 NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true); 324 NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
325 } 325 }
326 326
327 } // namespace extensions 327 } // namespace extensions
OLDNEW
« 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