Makes the TabStrip always have the ability to enter stacking mode on

Makes the TabStrip always have the ability to enter stacking mode on
chromeos.

BUG=142662
TEST=see bug
R=ben@chromium.org


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=151855

[Ben Goodger (Google), 2012-08-15 00:07:08]

lgtm


On Tue, Aug 14, 2012 at 4:59 PM, <sky@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Makes the TabStrip always have the ability to enter stacking mode on
> chromeos.
>
> BUG=142662
> TEST=see bug
> R=ben@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/10830325/<http://codereview.chromium.org/108...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M chrome/browser/ui/views/tabs/**browser_tab_strip_controller.**cc
>   M chrome/browser/ui/views/tabs/**tab_strip.cc
>
>
> Index: chrome/browser/ui/views/tabs/**browser_tab_strip_controller.**cc
> diff --git a/chrome/browser/ui/views/**tabs/browser_tab_strip_**controller.cc
> b/chrome/browser/ui/views/**tabs/browser_tab_strip_**controller.cc
> index dd7b8ccaa75af398829a9be96359a1**a447e59c36..**
> 8ed8a55d8661ce97fdcf9ae127eeab**0172fe860b 100644
> --- a/chrome/browser/ui/views/**tabs/browser_tab_strip_**controller.cc
> +++ b/chrome/browser/ui/views/**tabs/browser_tab_strip_**controller.cc
> @@ -59,8 +59,11 @@ TabStripLayoutType DetermineTabStripLayout(**PrefService*
> prefs,
>            switches::**kEnableStackedTabStrip)) {
>      return TAB_STRIP_LAYOUT_STACKED;
>    }
> +  // For chromeos always allow entering stacked mode.
> +#if !defined(OS_CHROMEOS)
>    if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH)
>      return TAB_STRIP_LAYOUT_SHRINK;
> +#endif
>    *adjust_layout = true;
>    switch (prefs->GetInteger(prefs::**kTabStripLayoutType)) {
>      case TAB_STRIP_LAYOUT_STACKED:
> Index: chrome/browser/ui/views/tabs/**tab_strip.cc
> diff --git a/chrome/browser/ui/views/**tabs/tab_strip.cc
> b/chrome/browser/ui/views/**tabs/tab_strip.cc
> index 5ca10e9d135a261c20a8355e2c2b32**2e2faeffb9..**
> 6b7242175105b5d3a9bd47bde8a184**a0edd4d0fd 100644
> --- a/chrome/browser/ui/views/**tabs/tab_strip.cc
> +++ b/chrome/browser/ui/views/**tabs/tab_strip.cc
> @@ -1414,7 +1414,7 @@ ui::GestureStatus TabStrip::OnGestureEvent(
>    switch (event.type()) {
>      case ui::ET_GESTURE_END:
>        EndDrag(false);
> -      if (adjust_layout_ && ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
> +      if (adjust_layout_) {
>          SetLayoutType(TAB_STRIP_**LAYOUT_STACKED, true);
>          controller_->**LayoutTypeMaybeChanged();
>        }
> @@ -1799,9 +1799,14 @@ void TabStrip::PaintClosingTabs(**gfx::Canvas*
> canvas, int index) {
>
>  void TabStrip::**UpdateLayoutTypeFromMouseEvent**(views::View* source,
>                                                const ui::MouseEvent&
> event) {
> -  if (!adjust_layout_ || ui::GetDisplayLayout() != ui::LAYOUT_TOUCH)
> +  if (!adjust_layout_)
>      return;
>
> +#if !defined(OS_CHROMEOS)
> +  if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH)
> +    return;
> +#endif
> +
>    // The following code attempts to switch to TAB_STRIP_LAYOUT_SHRINK
> when the
>    // mouse is used, and TAB_STRIP_LAYOUT_STACKED when a touch device is
>    // used. This is made problematic by windows generating mouse move
> events that
>
>
>

[commit-bot: I haz the power, 2012-08-15 00:13:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sky@chromium.org/10830325/1

[commit-bot: I haz the power, 2012-08-15 04:51:38]

Try job failure for 10830325-1 (retry) on linux_chromeos for steps
"interactive_ui_tests, browser_tests".
It's a second try, previously, steps "interactive_ui_tests, browser_tests"
failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2012-08-16 02:35:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sky@chromium.org/10830325/7003

[commit-bot: I haz the power, 2012-08-16 04:51:57]

Change committed as 151855