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

Unified Diff: ui/views/style/platform_style.cc

Issue 2558173006: Use overlay scrollbars by default in CrOS native UI. (Closed)
Patch Set: rebase Created 4 years 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 | « ash/common/system/tray/fixed_sized_scroll_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/style/platform_style.cc
diff --git a/ui/views/style/platform_style.cc b/ui/views/style/platform_style.cc
index 1febd1f4cd2b6cb48f73459294d3ca573a6f0d76..c7cbab1acc77b60d0a391973b922b5ebcaf497f9 100644
--- a/ui/views/style/platform_style.cc
+++ b/ui/views/style/platform_style.cc
@@ -17,7 +17,9 @@
#include "ui/views/controls/focusable_border.h"
#include "ui/views/controls/scrollbar/scroll_bar_views.h"
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS)
+#include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
+#elif defined(OS_LINUX)
#define DESKTOP_LINUX
#endif
@@ -56,7 +58,11 @@ gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled,
// static
std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
+#if defined(OS_CHROMEOS)
+ return base::MakeUnique<OverlayScrollBar>(is_horizontal);
+#else
return base::MakeUnique<ScrollBarViews>(is_horizontal);
+#endif
}
// static
« no previous file with comments | « ash/common/system/tray/fixed_sized_scroll_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698