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

Unified Diff: content/renderer/renderer_main.cc

Issue 7693019: Enable smooth scrolling on mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ppapi test Created 9 years, 4 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: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 2c1937b863a4ead326ca5f3c2f4665212a772d1c..5f7550df606b4bc0443fefc56169deb766b62651 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -33,6 +33,7 @@
#include <unistd.h>
#include "base/mac/mac_util.h"
+#include "base/mac/scoped_smooth_scrolling_disabler_mac.h"
#include "third_party/mach_override/mach_override.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#endif // OS_MACOSX
@@ -129,6 +130,10 @@ int RendererMain(const MainFunctionParams& parameters) {
#if defined(OS_MACOSX)
InstallFrameworkHacks();
+
+ base::ScopedSmoothScrollingDisabler disable_smooth_scrolling(
+ parsed_command_line.HasSwitch(
+ switches::kDisableMacSmoothScrollingForTesting));
#endif // OS_MACOSX
#if defined(OS_CHROMEOS)
« base/test/mock_time_provider.h ('K') | « content/renderer/render_view_browsertest_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698