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

ash/system/web_notification/web_notification_tray.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/web_notification/web_notification_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
@@ skipping 106 matching lines @@
   StopObserving();
 }
 
 void WorkAreaObserver::SetSystemTrayHeight(int height) {
   system_tray_height_ = height;
 
   // If the shelf is shown during auto-hide state, the distance from the edge
   // should be reduced by the height of shelf's shown height.
   if (shelf_ && shelf_->visibility_state() == SHELF_AUTO_HIDE &&
       shelf_->auto_hide_state() == SHELF_AUTO_HIDE_SHOWN) {
-    system_tray_height_ -= kShelfSize - ShelfLayoutManager::kAutoHideSize;
+    system_tray_height_ -= ShelfLayoutManager::GetPreferredShelfSize() -
+        ShelfLayoutManager::kAutoHideSize;
   }
 
-  if (system_tray_height_ > 0)
+  if (system_tray_height_ > 0 && ash::switches::UseAlternateShelfLayout())
     system_tray_height_ += message_center::kMarginBetweenItems;
 
   if (!shelf_)
     return;
 
   OnAutoHideStateChanged(shelf_->auto_hide_state());
 }
 
 void WorkAreaObserver::StartObserving(
     message_center::MessagePopupCollection* collection,
@@ skipping 25 matching lines @@
 
 void WorkAreaObserver::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
   gfx::Display display = Shell::GetScreen()->GetDisplayNearestWindow(
       shelf_->shelf_widget()->GetNativeView());
   gfx::Rect work_area = display.work_area();
   int width = 0;
   if ((shelf_->visibility_state() == SHELF_AUTO_HIDE) &&
       new_state == SHELF_AUTO_HIDE_SHOWN) {
     // Since the work_area is already reduced by kAutoHideSize, the inset width
     // should be just the difference.
-    width = kShelfSize - ShelfLayoutManager::kAutoHideSize;
+    width = ShelfLayoutManager::GetPreferredShelfSize() -
+        ShelfLayoutManager::kAutoHideSize;
   }
   work_area.Inset(shelf_->SelectValueForShelfAlignment(
       gfx::Insets(0, 0, width, 0),
       gfx::Insets(0, width, 0, 0),
       gfx::Insets(0, 0, 0, width),
       gfx::Insets(width, 0, 0, 0)));
   if (system_tray_height_ > 0) {
     work_area.set_height(
         std::max(0, work_area.height() - system_tray_height_));
     if (shelf_->GetAlignment() == SHELF_ALIGNMENT_TOP)
@@ skipping 24 matching lines @@
     views::TrayBubbleView::InitParams init_params =
         bubble->GetInitParams(anchor_alignment);
     views::View* anchor = tray->tray_container();
     if (anchor_alignment == views::TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM) {
       gfx::Point bounds(anchor->width() / 2, 0);
       views::View::ConvertPointToWidget(anchor, &bounds);
       init_params.arrow_offset = bounds.x();
     }
     views::TrayBubbleView* bubble_view = views::TrayBubbleView::Create(
         tray->GetBubbleWindowContainer(), anchor, tray, &init_params);
-    bubble_view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
+    if (ash::switches::UseAlternateShelfLayout())
+      bubble_view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
     bubble_wrapper_.reset(new TrayBubbleWrapper(tray, bubble_view));
     bubble->InitializeContents(bubble_view);
   }
 
   message_center::MessageBubbleBase* bubble() const { return bubble_.get(); }
 
   // Convenience accessors.
   views::TrayBubbleView* bubble_view() const { return bubble_->bubble_view(); }
 
  private:
@@ skipping 106 matching lines @@
 
 bool WebNotificationTray::ShowMessageCenterInternal(bool show_settings) {
   if (!ShouldShowMessageCenter())
     return false;
 
   should_block_shelf_auto_hide_ = true;
   message_center::MessageCenterBubble* message_center_bubble =
       new message_center::MessageCenterBubble(
           message_center(),
           message_center_tray_.get(),
-          true);
+          ash::switches::UseAlternateShelfLayout());
 
   int max_height = 0;
   aura::Window* status_area_window = status_area_widget()->GetNativeView();
   switch (GetShelfLayoutManager()->GetAlignment()) {
     case SHELF_ALIGNMENT_BOTTOM: {
       gfx::Rect shelf_bounds = GetShelfLayoutManager()->GetIdealBounds();
       max_height = shelf_bounds.y();
       break;
     }
     case SHELF_ALIGNMENT_TOP: {
@@ skipping 258 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash