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

Unified Diff: Source/web/tests/WebFrameTest.cpp

Issue 643473002: Made top controls work with virtual viewport pinch-to-zoom. (Blink) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed mac breakage (UseMockScrollbars) Created 6 years, 2 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 | « Source/web/tests/ViewportTest.cpp ('k') | Source/web/tests/data/content-width-1000.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index 2b0965ea90adf4a8d217361aa30c9f75d9ffc256..3a0eb018b66b684a764fb3f4630d1fe4a331547b 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -117,6 +117,7 @@ namespace {
using blink::URLTestHelpers::toKURL;
using blink::FrameTestHelpers::runPendingTasks;
+using blink::FrameTestHelpers::UseMockScrollbarSettings;
using namespace blink;
const int touchPointPadding = 32;
@@ -238,22 +239,6 @@ protected:
std::string m_chromeURL;
};
-class UseMockScrollbarSettings {
-public:
- UseMockScrollbarSettings()
- {
- Settings::setMockScrollbarsEnabled(true);
- RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
- EXPECT_TRUE(ScrollbarTheme::theme()->usesOverlayScrollbars());
- }
-
- ~UseMockScrollbarSettings()
- {
- Settings::setMockScrollbarsEnabled(false);
- RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
- }
-};
-
TEST_F(WebFrameTest, ContentText)
{
registerMockedHttpURLLoad("iframes_test.html");
« no previous file with comments | « Source/web/tests/ViewportTest.cpp ('k') | Source/web/tests/data/content-width-1000.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698