Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / system / chromeos / label_tray_view.cc

diff --git a/src/ash/system/chromeos/label_tray_view.cc b/src/ash/system/chromeos/label_tray_view.cc
index 5af294e..647c3d0 100644 (file)
--- a/src/ash/system/chromeos/label_tray_view.cc
+++ b/src/ash/system/chromeos/label_tray_view.cc
@@ -9,11 +9,11 @@
 #include "ash/system/tray/view_click_listener.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
-namespace internal {
 
 LabelTrayView::LabelTrayView(ViewClickListener* click_listener,
                              int icon_resource_id)
@@ -47,13 +47,12 @@ views::View* LabelTrayView::CreateChildView(
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     const gfx::ImageSkia* icon = rb.GetImageSkiaNamed(icon_resource_id_);
     child->AddIconAndLabel(*icon, message, gfx::Font::NORMAL);
-    child->set_border(
-        views::Border::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal,
-                                         0, kTrayPopupPaddingHorizontal));
+    child->SetBorder(views::Border::CreateEmptyBorder(
+        0, kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingHorizontal));
     child->text_label()->SetMultiLine(true);
     child->text_label()->SizeToFit(kTrayNotificationContentsWidth);
   } else {
-    child->AddLabel(message, gfx::Font::NORMAL);
+    child->AddLabel(message, gfx::ALIGN_LEFT, gfx::Font::NORMAL);
     child->text_label()->SetMultiLine(true);
     child->text_label()->SizeToFit(kTrayNotificationContentsWidth +
                                    kNotificationIconWidth);
@@ -64,5 +63,4 @@ views::View* LabelTrayView::CreateChildView(
   return child;
 }
 
-}  // namespace internal
 }  // namespace ash