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

Unified Diff: Source/core/platform/ScrollbarThemeMacCommon.mm

Issue 23187005: [DevTools] Use device metrics emulation implemented in content. (Closed) Base URL: svn://svn.chromium.org/blink/trunk/
Patch Set: Created 7 years, 3 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
Index: Source/core/platform/ScrollbarThemeMacCommon.mm
===================================================================
--- Source/core/platform/ScrollbarThemeMacCommon.mm (revision 157211)
+++ Source/core/platform/ScrollbarThemeMacCommon.mm (working copy)
@@ -32,6 +32,7 @@
#include "core/platform/ScrollView.h"
#include "core/platform/ScrollbarThemeMacNonOverlayAPI.h"
#include "core/platform/ScrollbarThemeMacOverlayAPI.h"
+#include "core/platform/ScrollbarThemeOverlay.h"
#include "core/platform/graphics/Gradient.h"
#include "core/platform/graphics/GraphicsContext.h"
#include "core/platform/graphics/GraphicsContextStateSaver.h"
@@ -128,6 +129,11 @@
ScrollbarTheme* ScrollbarTheme::nativeTheme()
{
+ if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) {
pfeldman 2013/09/19 12:46:05 Lets land this separately.
dgozman 2013/09/19 13:59:38 Done.
+ DEFINE_STATIC_LOCAL(ScrollbarThemeOverlay, theme, (7, 0, ScrollbarThemeOverlay::AllowHitTest));
+ return &theme;
+ }
+
if (isScrollbarOverlayAPIAvailable()) {
DEFINE_STATIC_LOCAL(ScrollbarThemeMacOverlayAPI, theme, ());
return &theme;

Powered by Google App Engine
This is Rietveld 408576698