commit 9bbd2f5e390b01907d97ecffde80aa1b06113aac
author Torne (Richard Coles) <torne@google.com> Thu Sep 19 22:37:05 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Thu Sep 19 22:37:05 2013 +0100
tree b0419918da12c4ba243b205d764fc55923b933dc
parent 7351f7fa4c898c0b87277d9b641210245e5f7f42

Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: I6aa2623a399e683ff92335749916c23088d1fbd8

Source/core/testing/InternalSettings.h

diff --git a/Source/core/testing/InternalSettings.h b/Source/core/testing/InternalSettings.h
index f364686..7433e1e 100644
--- a/Source/core/testing/InternalSettings.h
+++ b/Source/core/testing/InternalSettings.h
@@ -53,6 +53,7 @@
         bool m_originalAuthorShadowDOMForAnyElementEnabled;
         bool m_originalExperimentalWebSocketEnabled;
         bool m_originalStyleScoped;
+        bool m_originalOverlayScrollbarsEnabled;
         EditingBehaviorType m_originalEditingBehavior;
         bool m_originalTextAutosizingEnabled;
         IntSize m_originalTextAutosizingWindowSizeOverride;
@@ -108,6 +109,7 @@
     void setCSSExclusionsEnabled(bool);
     void setExperimentalWebSocketEnabled(bool);
     void setLangAttributeAwareFormControlUIEnabled(bool);
+    void setOverlayScrollbarsEnabled(bool);
     void setStyleScopedEnabled(bool);
 
 private: