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

chrome/browser/ui/views/tabs/tab_strip.h

Index: chrome/browser/ui/views/tabs/tab_strip.h
diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h
index 82c9c48bd040fd5c4ffc536ae29fc694a282f2b9..743470e68a0cc3916fc0510d2572c0069b632259 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.h
+++ b/chrome/browser/ui/views/tabs/tab_strip.h
@@ -64,11 +64,13 @@ class TabStrip : public views::View,
   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();
@@ -608,7 +610,7 @@ class TabStrip : public views::View,
   // 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_;