Remove --ash-enable-tray-dragging flag

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 59 matching lines @@
 // |kMaxAutoHideShowShelfRegionSize| refers to the maximum size of the region
 // from the right edge of the primary display which can trigger showing the
 // auto hidden shelf. The region is used to make it easier to trigger showing
 // the auto hidden shelf when the shelf is on the boundary between displays.
 const int kMaxAutoHideShowShelfRegionSize = 10;
 
 ui::Layer* GetLayer(views::Widget* widget) {
   return widget->GetNativeView()->layer();
 }
 
-bool IsDraggingTrayEnabled() {
-  static bool dragging_tray_allowed = base::CommandLine::ForCurrentProcess()->
-      HasSwitch(ash::switches::kAshEnableTrayDragging);
-  return dragging_tray_allowed;
-}
-
 }  // namespace
 
 // static
 const int ShelfLayoutManager::kWorkspaceAreaVisibleInset = 2;
 
 // static
 const int ShelfLayoutManager::kWorkspaceAreaAutoHideInset = 5;
 
 // static
 const int ShelfLayoutManager::kAutoHideSize = 3;
@@ skipping 310 matching lines @@
 }
 
 void ShelfLayoutManager::StartGestureDrag(const ui::GestureEvent& gesture) {
   gesture_drag_status_ = GESTURE_DRAG_IN_PROGRESS;
   gesture_drag_amount_ = 0.f;
   gesture_drag_auto_hide_state_ = visibility_state() == SHELF_AUTO_HIDE ?
       auto_hide_state() : SHELF_AUTO_HIDE_SHOWN;
   UpdateShelfBackground(BACKGROUND_CHANGE_ANIMATE);
 }
 
-ShelfLayoutManager::DragState ShelfLayoutManager::UpdateGestureDrag(
+void ShelfLayoutManager::UpdateGestureDrag(
     const ui::GestureEvent& gesture) {
   bool horizontal = IsHorizontalAlignment();
   gesture_drag_amount_ += horizontal ? gesture.details().scroll_y() :
                                        gesture.details().scroll_x();
   LayoutShelf();
-
-  // Start reveling the status menu when:
-  //   - dragging up on an already visible shelf
-  //   - dragging up on a hidden shelf, but it is currently completely visible.
-  if (horizontal && gesture.details().scroll_y() < 0) {
-    int min_height = 0;
-    if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_HIDDEN && shelf_)
-      min_height = shelf_->GetContentsView()->GetPreferredSize().height();
-
-    if (min_height < shelf_->GetWindowBoundsInScreen().height() &&
-        gesture.root_location().x() >=
-        shelf_->status_area_widget()->GetWindowBoundsInScreen().x() &&
-        IsDraggingTrayEnabled())
-      return DRAG_TRAY;
-  }
-
-  return DRAG_SHELF;
 }
 
 void ShelfLayoutManager::CompleteGestureDrag(const ui::GestureEvent& gesture) {
   bool horizontal = IsHorizontalAlignment();
   bool should_change = false;
   if (gesture.type() == ui::ET_GESTURE_SCROLL_END) {
     // The visibility of the shelf changes only if the shelf was dragged X%
     // along the correct axis. If the shelf was already visible, then the
     // direction of the drag does not matter.
     const float kDragHideThreshold = 0.4f;
@@ skipping 731 matching lines @@
 }
 
 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() {
   shelf_->SetAlignment(state_.is_adding_user_screen || state_.is_screen_locked ?
                            SHELF_ALIGNMENT_BOTTOM : alignment_);
   UpdateVisibilityState();
   LayoutShelf();
 }
 
 }  // namespace ash