Removes --enable-stacked-tab-strip flag (Stacked Tabs)

chrome/browser/ui/views/tabs/tab_strip.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 CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 46 matching lines @@
  public:
   static const char kViewClassName[];
 
   explicit TabStrip(TabStripController* controller);
   virtual ~TabStrip();
 
   // Add and remove observers to changes within this TabStrip.
   void AddObserver(TabStripObserver* observer);
   void RemoveObserver(TabStripObserver* observer);
 
-  // Sets the layout type. If |adjust_layout| is true the layout type changes
+  // If |adjust_layout| is true the layout type changes
   // based on whether the user uses a mouse or touch device with the tabstrip.
-  // If |adjust_layout| is false the layout is fixed to |layout_type|.
-  void SetLayoutType(TabStripLayoutType layout_type, bool adjust_layout);
-  TabStripLayoutType layout_type() const { return layout_type_; }
+  void set_adjust_layout(bool adjust_layout) { adjust_layout_ = adjust_layout; }
+
+  // Sets if the layout type is stacked.

[sky, 2014/05/21 22:57:19]

You also need to describe what these two values mean.

[varkha, 2014/05/23 17:43:23]

Done.

+  void SetLayoutTypeStacked(bool layout_type_stacked);
+  bool layout_type_stacked() const { return layout_type_stacked_; }
 
   // Returns the bounds of the new tab button.
   gfx::Rect GetNewTabButtonBounds();
 
   // Returns true if the new tab button should be sized to the top of the tab
   // strip.
   bool SizeTabButtonToTopOfTabStrip();
 
   // Starts highlighting the tab at the specified index.
   void StartHighlight(int model_index);
@@ skipping 519 matching lines @@
 
   // The controller for a drag initiated from a Tab. Valid for the lifetime of
   // the drag session.
   scoped_ptr<TabDragController> drag_controller_;
 
   views::BoundsAnimator bounds_animator_;
 
   // Size we last layed out at.
   gfx::Size last_layout_size_;
 
-  TabStripLayoutType layout_type_;
+  bool layout_type_stacked_;

[sky, 2014/05/21 22:57:19]

How about stacked_layout_?

[varkha, 2014/05/23 17:43:23]

Done.

 
   // See description above SetLayoutType().
   bool adjust_layout_;
 
   // Only used while in touch mode.
   scoped_ptr<StackedTabStripLayout> touch_layout_;
 
   // If true the layout type is set to TAB_STRIP_LAYOUT_SHRINK when the mouse
   // exits the tabstrip (as determined using MouseWatcher).
   bool reset_to_shrink_on_exit_;
@@ skipping 15 matching lines @@
   bool immersive_style_;
 
   // Our observers.
   typedef ObserverList<TabStripObserver> TabStripObservers;
   TabStripObservers observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TabStrip);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_