| 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
|
|
|