Remove "Alternate frame caption button style" command line flag

ash/wm/workspace/workspace_window_resizer.h

 // 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.
 
 #ifndef ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
 #define ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
 
 #include <vector>
 
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/workspace/magnetism_matcher.h"
-#include "ash/wm/workspace/snap_types.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/window_tracker.h"
 
 namespace ash {
 class DockedWindowLayoutManager;
 class PhantomWindowController;
 class TwoStepEdgeCycler;
@@ skipping 39 matching lines @@
   virtual void CompleteDrag() OVERRIDE;
   virtual void RevertDrag() OVERRIDE;
 
  private:
   WorkspaceWindowResizer(wm::WindowState* window_state,
                          const std::vector<aura::Window*>& attached_windows);
 
  private:
   friend class WorkspaceWindowResizerTest;
 
+  // The edge to which the window should be snapped at the end of the drag.
+  enum SnapType {
+    SNAP_LEFT,
+    SNAP_RIGHT,
+    SNAP_NONE
+  };
+
   // Lays out the attached windows. |bounds| is the bounds of the main window.
   void LayoutAttachedWindows(gfx::Rect* bounds);
 
   // Calculates the new sizes of the attached windows, given that the main
   // window has been resized (along the primary axis) by |delta|.
   // |available_size| is the maximum length of the space that the attached
   // windows are allowed to occupy (ie: the distance between the right/bottom
   // edge of the primary window and the right/bottom of the desktop area).
   // Populates |sizes| with the desired sizes of the attached windows, and
   // returns the number of pixels that couldn't be allocated to the attached
@@ skipping 55 matching lines @@
   int PrimaryAxisCoordinate(int x, int y) const;
 
   // Updates the bounds of the phantom window for window snapping.
   void UpdateSnapPhantomWindow(const gfx::Point& location,
                                const gfx::Rect& bounds);
 
   // Restacks the windows z-order position so that one of the windows is at the
   // top of the z-order, and the rest directly underneath it.
   void RestackWindows();
 
-  // Returns the SnapType for the specified point. SNAP_NONE is used if no
-  // snapping should be used.
+  // Returns the edge to which the window should be snapped to if the user does
+  // no more dragging. SNAP_NONE is returned if the window should not be
+  // snapped.
   SnapType GetSnapType(const gfx::Point& location) const;
 
   // Returns true if |bounds_in_parent| are valid bounds for snapped state type
   // |snapped_type|.
   bool AreBoundsValidSnappedBounds(wm::WindowStateType snapped_type,
                                    const gfx::Rect& bounds_in_parent) const;
 
   // Docks or undocks the dragged window.
   void SetDraggedWindowDocked(bool should_dock);
 
@@ skipping 20 matching lines @@
   int total_initial_size_;
 
   // Gives a previews of where the the window will end up. Only used if there
   // is a grid and the caption is being dragged.
   scoped_ptr<PhantomWindowController> snap_phantom_window_controller_;
 
   // Used to determine whether the window should be snapped or docked when
   // the user drags a window to the edge of the screen.
   scoped_ptr<TwoStepEdgeCycler> edge_cycler_;
 
-  // Last SnapType.
+  // The edge to which the window should be snapped to at the end of the drag.
   SnapType snap_type_;
 
   // Number of mouse moves since the last bounds change. Only used for phantom
   // placement to track when the mouse is moved while pushed against the edge of
   // the screen.
   int num_mouse_moves_since_bounds_change_;
 
   // The mouse location passed to Drag().
   gfx::Point last_mouse_location_;
 
@@ skipping 16 matching lines @@
 
   // Current instance for use by the WorkspaceWindowResizerTest.
   static WorkspaceWindowResizer* instance_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_WINDOW_RESIZER_H_