Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ash / system / tray / tray_background_view.cc

diff --git a/src/ash/system/tray/tray_background_view.cc b/src/ash/system/tray/tray_background_view.cc
index f4b75bc..b19b137 100644 (file)
--- a/src/ash/system/tray/tray_background_view.cc
+++ b/src/ash/system/tray/tray_background_view.cc
@@ -276,7 +276,7 @@ void TrayBackgroundView::TrayContainer::UpdateLayout() {
 
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
-    layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_FILL);
+    layout->SetDefaultFlex(1);
     views::View::SetLayoutManager(layout);
   } else {
     SetBorder(views::Border::CreateEmptyBorder(
@@ -287,7 +287,7 @@ void TrayBackgroundView::TrayContainer::UpdateLayout() {
 
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
-    layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_FILL);
+    layout->SetDefaultFlex(1);
     views::View::SetLayoutManager(layout);
   }
   PreferredSizeChanged();