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

Unified Diff: ash/system/web_notification/web_notification_tray.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 11 months 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
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | ash/wm/caption_buttons/maximize_bubble_controller_bubble.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/web_notification/web_notification_tray.cc
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
index 89c2deef1d8c4823b6da0ff5d6797c1188a59330..52f47d5c7d95692ed7c88fd1a624b05f03dbefd7 100644
--- a/ash/system/web_notification/web_notification_tray.cc
+++ b/ash/system/web_notification/web_notification_tray.cc
@@ -311,7 +311,7 @@ WebNotificationTray::WebNotificationTray(
ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON);
tray_container()->AddChildView(button_);
SetContentsBackground();
- tray_container()->set_border(NULL);
+ tray_container()->SetBorder(views::Border::NullBorder());
SetVisible(false);
message_center_tray_.reset(new message_center::MessageCenterTray(
this,
@@ -458,7 +458,7 @@ void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
if (alignment == shelf_alignment())
return;
internal::TrayBackgroundView::SetShelfAlignment(alignment);
- tray_container()->set_border(NULL);
+ tray_container()->SetBorder(views::Border::NullBorder());
// Destroy any existing bubble so that it will be rebuilt correctly.
message_center_tray_->HideMessageCenterBubble();
message_center_tray_->HidePopupBubble();
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | ash/wm/caption_buttons/maximize_bubble_controller_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698