Chromium Code Reviews| 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 d3649cb2fafa3a45918d4c5a08fa4465327fc1c6..6d466739005598860c14fa7fcca238d7cd060714 100644 |
| --- a/chrome/browser/ui/views/tabs/tab_strip.cc |
| +++ b/chrome/browser/ui/views/tabs/tab_strip.cc |
| @@ -1379,9 +1379,12 @@ bool TabStrip::ShouldPaintTab(const Tab* tab, gfx::Rect* clip) { |
| bool TabStrip::CanPaintThrobberToLayer() const { |
| // Disable layer-painting of throbbers if dragging, if any tab animation is in |
| - // progress, or if stacked tabs are enabled. |
| + // progress, or if stacked tabs are enabled. Also disable in fullscreen: when |
| + // "immersive" the tab strip could be sliding in or out while transitioning to |
| + // or away from |immersive_style_| and, for other modes, there's no tab strip. |
| const bool dragging = drag_controller_ && drag_controller_->started_drag(); |
| - return !touch_layout_ && !dragging && !IsAnimating(); |
| + return !touch_layout_ && !dragging && !IsAnimating() && |
| + !GetWidget()->IsFullscreen(); |
|
sky
2016/03/03 20:31:01
Are you sure you don't need a null check for GetWi
tapted
2016/03/03 22:44:07
Added a null check - leaving it off certainly wasn
|
| } |
| bool TabStrip::IsIncognito() const { |