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

Unified Diff: chrome/browser/ui/views/tabs/tab_strip.cc

Issue 1694333002: Remove HostDesktopType from c/b/ui/views/tabs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-27
Patch Set: rebase and linux Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8fed116ce44a651d67d0e92673f35717083628f6..32edbdc985da732234388ec83d279d2b9dbbc2a1 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -1093,18 +1093,18 @@ void TabStrip::SetImmersiveStyle(bool enable) {
}
SkAlpha TabStrip::GetInactiveAlpha(bool for_new_tab_button) const {
- static const SkAlpha kInactiveTabAlphaAsh = 230;
- static const SkAlpha kInactiveTabAlphaGlass = 200;
static const SkAlpha kInactiveTabAlphaOpaque = 255;
static const double kMultiSelectionMultiplier = 0.6;
- const chrome::HostDesktopType host_desktop_type =
- chrome::GetHostDesktopTypeForNativeView(GetWidget()->GetNativeView());
SkAlpha base_alpha = kInactiveTabAlphaOpaque;
- if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
- base_alpha = kInactiveTabAlphaAsh;
- else if (GetWidget()->ShouldWindowContentsBeTransparent())
+#if defined(USE_ASH)
+ static const SkAlpha kInactiveTabAlphaAsh = 230;
+ base_alpha = kInactiveTabAlphaAsh;
+#else
+ static const SkAlpha kInactiveTabAlphaGlass = 200;
+ if (GetWidget()->ShouldWindowContentsBeTransparent())
base_alpha = kInactiveTabAlphaGlass;
+#endif // USE_ASH
return (for_new_tab_button || (GetSelectionModel().size() <= 1)) ?
base_alpha : static_cast<SkAlpha>(kMultiSelectionMultiplier * base_alpha);
}
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698