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

Side by Side Diff: ui/message_center/views/notification_view.cc

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/message_center/views/notification_view.h" 5 #include "ui/message_center/views/notification_view.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.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 "grit/ui_resources.h" 10 #include "grit/ui_resources.h"
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 NotificationView::NotificationView(MessageCenterController* controller, 296 NotificationView::NotificationView(MessageCenterController* controller,
297 const Notification& notification, 297 const Notification& notification,
298 bool expanded) 298 bool expanded)
299 : MessageView(this, 299 : MessageView(this,
300 notification.id(), 300 notification.id(),
301 notification.notifier_id(), 301 notification.notifier_id(),
302 notification.display_source()), 302 notification.display_source()),
303 controller_(controller), 303 controller_(controller),
304 clickable_(notification.clickable()), 304 clickable_(notification.clickable()),
305 is_expanded_(expanded) { 305 is_expanded_(expanded) {
306 std::vector<string16> accessible_lines; 306 std::vector<base::string16> accessible_lines;
307 // Create the top_view_, which collects into a vertical box all content 307 // Create the top_view_, which collects into a vertical box all content
308 // at the top of the notification (to the right of the icon) except for the 308 // at the top of the notification (to the right of the icon) except for the
309 // close button. 309 // close button.
310 top_view_ = new views::View(); 310 top_view_ = new views::View();
311 top_view_->SetLayoutManager( 311 top_view_->SetLayoutManager(
312 new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0)); 312 new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
313 top_view_->set_border(MakeEmptyBorder( 313 top_view_->set_border(MakeEmptyBorder(
314 kTextTopPadding - 8, 0, kTextBottomPadding - 5, 0)); 314 kTextTopPadding - 8, 0, kTextBottomPadding - 5, 0));
315 315
316 const gfx::FontList default_label_font_list = views::Label().font_list(); 316 const gfx::FontList default_label_font_list = views::Label().font_list();
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 return message_view_ ? 659 return message_view_ ?
660 message_view_->GetLinesForWidthAndLimit(width, limit) : 0; 660 message_view_->GetLinesForWidthAndLimit(width, limit) : 0;
661 } 661 }
662 662
663 int NotificationView::GetMessageHeight(int width, int limit) { 663 int NotificationView::GetMessageHeight(int width, int limit) {
664 return message_view_ ? 664 return message_view_ ?
665 message_view_->GetSizeForWidthAndLines(width, limit).height() : 0; 665 message_view_->GetSizeForWidthAndLines(width, limit).height() : 0;
666 } 666 }
667 667
668 } // namespace message_center 668 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/views/notification_button.cc ('k') | ui/message_center/views/notifier_settings_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698