summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-04 19:54:17 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-04 19:54:17 +0000
commit82ac65b8f75dd7ee35934c7316c95e4fad075d91 (patch)
treede6412757d6c70907e587305775ff148dda32e8e /chrome/browser/cocoa
parentbd618b4cc8444654ebd1e7dfcde40d7eb94bb105 (diff)
downloadchromium_src-82ac65b8f75dd7ee35934c7316c95e4fad075d91.zip
chromium_src-82ac65b8f75dd7ee35934c7316c95e4fad075d91.tar.gz
chromium_src-82ac65b8f75dd7ee35934c7316c95e4fad075d91.tar.bz2
Back out r30033 which broke drag scrolling in web pages until we have a better solution.
BUG=22199 TEST=dragging to scroll in web pages should again work. Review URL: http://codereview.chromium.org/367001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/base_view.mm3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/base_view.mm b/chrome/browser/cocoa/base_view.mm
index 7dcfe16..e5ed3a2 100644
--- a/chrome/browser/cocoa/base_view.mm
+++ b/chrome/browser/cocoa/base_view.mm
@@ -11,8 +11,7 @@
if (self) {
trackingArea_ =
[[NSTrackingArea alloc] initWithRect:frame
- options:NSTrackingMouseEnteredAndExited |
- NSTrackingMouseMoved |
+ options:NSTrackingMouseMoved |
NSTrackingActiveInActiveApp |
NSTrackingInVisibleRect
owner:self