Added flag for alternate launcher settings (remaining changes to come).

ash/shelf/shelf_layout_manager.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/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <string>
@@ skipping 52 matching lines @@
 ui::Layer* GetLayer(views::Widget* widget) {
   return widget->GetNativeView()->layer();
 }
 
 bool IsDraggingTrayEnabled() {
   static bool dragging_tray_allowed = CommandLine::ForCurrentProcess()->
       HasSwitch(ash::switches::kAshEnableTrayDragging);
   return dragging_tray_allowed;
 }
 
+int GetPreferredShelfSize() {
+  return ash::switches::UseAlternateShelfLayout() ?
+      ShelfLayoutManager::kShelfSize : kLauncherPreferredSize;
+}
+
 }  // namespace
 
 // static
 const int ShelfLayoutManager::kWorkspaceAreaVisibleInset = 2;
 
 // static
 const int ShelfLayoutManager::kWorkspaceAreaAutoHideInset = 5;
 
 // static
 const int ShelfLayoutManager::kAutoHideSize = 3;
 
+// static
+const int ShelfLayoutManager::kShelfSize = 47;
+
 // ShelfLayoutManager::AutoHideEventFilter -------------------------------------
 
 // Notifies ShelfLayoutManager any time the mouse moves.
 class ShelfLayoutManager::AutoHideEventFilter : public ui::EventHandler {
  public:
   explicit AutoHideEventFilter(ShelfLayoutManager* shelf);
   virtual ~AutoHideEventFilter();
 
   // Returns true if the last mouse event was a mouse drag.
   bool in_mouse_drag() const { return in_mouse_drag_; }
@@ skipping 558 matching lines @@
 void ShelfLayoutManager::StopAnimating() {
   GetLayer(shelf_)->GetAnimator()->StopAnimating();
   GetLayer(shelf_->status_area_widget())->GetAnimator()->StopAnimating();
 }
 
 void ShelfLayoutManager::GetShelfSize(int* width, int* height) {
   *width = *height = 0;
   gfx::Size status_size(
       shelf_->status_area_widget()->GetWindowBoundsInScreen().size());
   if (IsHorizontalAlignment())
-    *height = kLauncherPreferredSize;
+    *height = GetPreferredShelfSize();
   else
-    *width = kLauncherPreferredSize;
+    *width = GetPreferredShelfSize();
 }
 
 void ShelfLayoutManager::AdjustBoundsBasedOnAlignment(int inset,
                                                       gfx::Rect* bounds) const {
   bounds->Inset(SelectValueForShelfAlignment(
       gfx::Insets(0, 0, inset, 0),
       gfx::Insets(0, inset, 0, 0),
       gfx::Insets(0, 0, 0, inset),
       gfx::Insets(inset, 0, 0, 0)));
 }
@@ skipping 31 matching lines @@
   target_bounds->shelf_bounds_in_root = SelectValueForShelfAlignment(
       gfx::Rect(available_bounds.x(), available_bounds.bottom() - shelf_height,
                     available_bounds.width(), shelf_height),
       gfx::Rect(available_bounds.x(), available_bounds.y(),
                     shelf_width, available_bounds.height()),
       gfx::Rect(available_bounds.right() - shelf_width, available_bounds.y(),
                     shelf_width, available_bounds.height()),
       gfx::Rect(available_bounds.x(), available_bounds.y(),
                     available_bounds.width(), shelf_height));
 
-  int status_inset = std::max(0, kLauncherPreferredSize -
+  int status_inset = std::max(0, GetPreferredShelfSize() -
       PrimaryAxisValue(status_size.height(), status_size.width()));
 
   target_bounds->status_bounds_in_shelf = SelectValueForShelfAlignment(
       gfx::Rect(base::i18n::IsRTL() ? 0 : shelf_width - status_size.width(),
                     status_inset, status_size.width(), status_size.height()),
       gfx::Rect(shelf_width - (status_size.width() + status_inset),
                     shelf_height - status_size.height(), status_size.width(),
                     status_size.height()),
       gfx::Rect(status_inset, shelf_height - status_size.height(),
                     status_size.width(), status_size.height()),
@@ skipping 46 matching lines @@
   const gfx::Rect& available_bounds(root_window_->bounds());
   int resistance_free_region = 0;
 
   if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_HIDDEN &&
       visibility_state() == SHELF_AUTO_HIDE &&
       auto_hide_state() != SHELF_AUTO_HIDE_SHOWN) {
     // If the shelf was hidden when the drag started (and the state hasn't
     // changed since then, e.g. because the tray-menu was shown because of the
     // drag), then allow the drag some resistance-free region at first to make
     // sure the shelf sticks with the finger until the shelf is visible.
-    resistance_free_region = kLauncherPreferredSize - kAutoHideSize;
+    resistance_free_region = GetPreferredShelfSize() - kAutoHideSize;
   }
 
   bool resist = SelectValueForShelfAlignment(
       gesture_drag_amount_ < -resistance_free_region,
       gesture_drag_amount_ > resistance_free_region,
       gesture_drag_amount_ < -resistance_free_region,
       gesture_drag_amount_ > resistance_free_region);
 
   float translate = 0.f;
   if (resist) {
@@ skipping 183 matching lines @@
       return gfx::Insets(0, distance, 0, 0);
     case SHELF_ALIGNMENT_TOP:
       return gfx::Insets(0, 0, distance, 0);
   }
   NOTREACHED();
   return gfx::Insets();
 }
 
 }  // namespace internal
 }  // namespace ash