Ash:Shelf - Cleanup of Alternate Shelf (part 1)

ash/system/web_notification/web_notification_tray.cc

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..1dd290fb8f57625ea7e6c349ffd75212c4835810 100644
--- a/ash/system/web_notification/web_notification_tray.cc
+++ b/ash/system/web_notification/web_notification_tray.cc
@@ -128,7 +128,7 @@ void WorkAreaObserver::SetSystemTrayHeight(int height) {
         ShelfLayoutManager::kAutoHideSize;
   }
 
-  if (system_tray_height_ > 0 && ash::switches::UseAlternateShelfLayout())
+  if (system_tray_height_ > 0)
     system_tray_height_ += message_center::kMarginBetweenItems;
 
   if (!shelf_)
@@ -220,8 +220,7 @@ class WebNotificationBubbleWrapper {
     }
     views::TrayBubbleView* bubble_view = views::TrayBubbleView::Create(
         tray->GetBubbleWindowContainer(), anchor, tray, &init_params);
-    if (ash::switches::UseAlternateShelfLayout())
-      bubble_view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
+    bubble_view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
     bubble_wrapper_.reset(new TrayBubbleWrapper(tray, bubble_view));
     bubble->InitializeContents(bubble_view);
   }
@@ -338,7 +337,7 @@ bool WebNotificationTray::ShowMessageCenterInternal(bool show_settings) {
       new message_center::MessageCenterBubble(
           message_center(),
           message_center_tray_.get(),
-          ash::switches::UseAlternateShelfLayout());
+          true);
 
   int max_height = 0;
   aura::Window* status_area_window = status_area_widget()->GetNativeView();
@@ -409,7 +408,7 @@ bool WebNotificationTray::ShowPopups() {
           internal::kShellWindowId_StatusContainer),
       message_center(),
       message_center_tray_.get(),
-      ash::switches::UseAlternateShelfLayout()));
+      true));
   work_area_observer_->StartObserving(
       popup_collection_.get(), GetWidget()->GetNativeView()->GetRootWindow());
   return true;