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

Side by Side Diff: third_party/WebKit/Source/web/tests/FrameTestHelpers.h

Issue 2780923003: Revert of Change minimum length of Aura overlay scrollbars. (Closed)
Patch Set: Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 public: 119 public:
120 UseMockScrollbarSettings() 120 UseMockScrollbarSettings()
121 : m_originalMockScrollbarEnabled(Settings::mockScrollbarsEnabled()), 121 : m_originalMockScrollbarEnabled(Settings::mockScrollbarsEnabled()),
122 m_originalOverlayScrollbarsEnabled( 122 m_originalOverlayScrollbarsEnabled(
123 RuntimeEnabledFeatures::overlayScrollbarsEnabled()) { 123 RuntimeEnabledFeatures::overlayScrollbarsEnabled()) {
124 Settings::setMockScrollbarsEnabled(true); 124 Settings::setMockScrollbarsEnabled(true);
125 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true); 125 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
126 EXPECT_TRUE(ScrollbarTheme::theme().usesOverlayScrollbars()); 126 EXPECT_TRUE(ScrollbarTheme::theme().usesOverlayScrollbars());
127 } 127 }
128 128
129 UseMockScrollbarSettings(bool useMock, bool useOverlay)
130 : m_originalMockScrollbarEnabled(Settings::mockScrollbarsEnabled()),
131 m_originalOverlayScrollbarsEnabled(
132 RuntimeEnabledFeatures::overlayScrollbarsEnabled()) {
133 Settings::setMockScrollbarsEnabled(useMock);
134 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(useOverlay);
135 EXPECT_EQ(useOverlay, ScrollbarTheme::theme().usesOverlayScrollbars());
136 }
137
138 ~UseMockScrollbarSettings() { 129 ~UseMockScrollbarSettings() {
139 Settings::setMockScrollbarsEnabled(m_originalMockScrollbarEnabled); 130 Settings::setMockScrollbarsEnabled(m_originalMockScrollbarEnabled);
140 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled( 131 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(
141 m_originalOverlayScrollbarsEnabled); 132 m_originalOverlayScrollbarsEnabled);
142 } 133 }
143 134
144 private: 135 private:
145 bool m_originalMockScrollbarEnabled; 136 bool m_originalMockScrollbarEnabled;
146 bool m_originalOverlayScrollbarsEnabled; 137 bool m_originalOverlayScrollbarsEnabled;
147 }; 138 };
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 WebDOMMessageEvent) override {} 277 WebDOMMessageEvent) override {}
287 278
288 private: 279 private:
289 Persistent<WebRemoteFrameImpl> const m_frame; 280 Persistent<WebRemoteFrameImpl> const m_frame;
290 }; 281 };
291 282
292 } // namespace FrameTestHelpers 283 } // namespace FrameTestHelpers
293 } // namespace blink 284 } // namespace blink
294 285
295 #endif // FrameTestHelpers_h 286 #endif // FrameTestHelpers_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698