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

ash/system/tray/system_tray.cc

Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 48d90c51e27781aa5d960d0c9b8ad996a2ae4d34..8fee7e48c02b2a68c7cc7388fe9d76f8e8fc0175 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -94,11 +94,9 @@ class SystemBubbleWrapper {
     bubble_->InitView(anchor, login_status, init_params);
     bubble_wrapper_.reset(
         new internal::TrayBubbleWrapper(tray, bubble_->bubble_view()));
-    if (ash::switches::UseAlternateShelfLayout()) {
-      // The system bubble should not have an arrow.
-      bubble_->bubble_view()->SetArrowPaintType(
-          views::BubbleBorder::PAINT_NONE);
-    }
+    // The system bubble should not have an arrow.
+    bubble_->bubble_view()->SetArrowPaintType(
+        views::BubbleBorder::PAINT_NONE);
     is_persistent_ = is_persistent;
 
     // If ChromeVox is enabled, focus the default item if no item is focused.
@@ -488,8 +486,7 @@ void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items,
                                            menu_width,
                                            kTrayPopupMaxWidth);
     init_params.can_activate = can_activate;
-    init_params.first_item_has_no_margin =
-        ash::switches::UseAlternateShelfLayout();
+    init_params.first_item_has_no_margin = true;

[James Cook, 2014/01/23 18:02:35]

Just to double-check, and not for this CL, is first_item_has_no_margin ever
false? Could it be deleted?

[Harry McCleave, 2014/01/24 22:48:47]

I thought it was the case it was false for some bubbles not associated with the
shelf Stefan do you remember? (my memory tells me Stefan added this fixing a
number of issues).

[James Cook, 2014/01/25 00:12:14]

I didn't see any obvious cases where it was false, but I might have missed one.

[Mr4D (OOO till 08-26), 2014/01/25 01:37:38]

Hmm. The Bubble code gets used in many places. e.g.
MessageCenterBubble::GetInitParam creates a views::TrayBubbleView::InitParams
and sets this member with a variable which got passed into the constructor.

I don't want to exclude the possibility that it might be obsolete (many things
have changed) but the default is false, we are setting oit to true and others
are also using it. More investigation would be necessary. Maybe another CL?

     if (detailed) {
       // This is the case where a volume control or brightness control bubble
       // is created.
@@ -560,8 +557,7 @@ void SystemTray::UpdateNotificationBubble() {
                                          GetAnchorAlignment(),
                                          kTrayPopupMinWidth,
                                          kTrayPopupMaxWidth);
-  init_params.first_item_has_no_margin =
-      ash::switches::UseAlternateShelfLayout();
+  init_params.first_item_has_no_margin = true;
   init_params.arrow_color = kBackgroundColor;
   init_params.arrow_offset = GetTrayXOffset(notification_items_[0]);
   notification_bubble_.reset(