Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: chrome/browser/ui/views/tabs/tab_strip.cc

Issue 2084583004: Fix tab coloring bugs with multiple open profiles which used different colors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.h ('k') | chrome/browser/ui/views/tabs/tab_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/tabs/tab_strip.h" 5 #include "chrome/browser/ui/views/tabs/tab_strip.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <iterator> 10 #include <iterator>
(...skipping 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after
1395 // Disable layer-painting of throbbers if dragging, if any tab animation is in 1395 // Disable layer-painting of throbbers if dragging, if any tab animation is in
1396 // progress, or if stacked tabs are enabled. Also disable in fullscreen: when 1396 // progress, or if stacked tabs are enabled. Also disable in fullscreen: when
1397 // "immersive" the tab strip could be sliding in or out while transitioning to 1397 // "immersive" the tab strip could be sliding in or out while transitioning to
1398 // or away from |immersive_style_| and, for other modes, there's no tab strip. 1398 // or away from |immersive_style_| and, for other modes, there's no tab strip.
1399 const bool dragging = drag_controller_ && drag_controller_->started_drag(); 1399 const bool dragging = drag_controller_ && drag_controller_->started_drag();
1400 const views::Widget* widget = GetWidget(); 1400 const views::Widget* widget = GetWidget();
1401 return widget && !touch_layout_ && !dragging && !IsAnimating() && 1401 return widget && !touch_layout_ && !dragging && !IsAnimating() &&
1402 !widget->IsFullscreen(); 1402 !widget->IsFullscreen();
1403 } 1403 }
1404 1404
1405 bool TabStrip::IsIncognito() const {
1406 return controller_->IsIncognito();
1407 }
1408
1409 bool TabStrip::IsImmersiveStyle() const { 1405 bool TabStrip::IsImmersiveStyle() const {
1410 return immersive_style_; 1406 return immersive_style_;
1411 } 1407 }
1412 1408
1413 SkColor TabStrip::GetToolbarTopSeparatorColor() const { 1409 SkColor TabStrip::GetToolbarTopSeparatorColor() const {
1414 return controller_->GetToolbarTopSeparatorColor(); 1410 return controller_->GetToolbarTopSeparatorColor();
1415 } 1411 }
1416 1412
1417 int TabStrip::GetBackgroundResourceId(bool* custom_image) const { 1413 int TabStrip::GetBackgroundResourceId(bool* custom_image) const {
1418 const ui::ThemeProvider* tp = GetThemeProvider(); 1414 const ui::ThemeProvider* tp = GetThemeProvider();
(...skipping 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after
2891 ConvertPointToViewAndGetEventHandler(this, newtab_button_, point); 2887 ConvertPointToViewAndGetEventHandler(this, newtab_button_, point);
2892 if (view) 2888 if (view)
2893 return view; 2889 return view;
2894 } 2890 }
2895 Tab* tab = FindTabForEvent(point); 2891 Tab* tab = FindTabForEvent(point);
2896 if (tab) 2892 if (tab)
2897 return ConvertPointToViewAndGetEventHandler(this, tab, point); 2893 return ConvertPointToViewAndGetEventHandler(this, tab, point);
2898 } 2894 }
2899 return this; 2895 return this;
2900 } 2896 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.h ('k') | chrome/browser/ui/views/tabs/tab_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698