diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 16:01:16 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 16:01:16 +0000 |
| commit | 3fec83dd87b54f18feb29759a4915948200fa84e (patch) | |
| tree | 38c6f22cbfabee852f7c7d14ce91891835acb699 /ash/wm/partial_screenshot_view.cc | |
| parent | 9da45cb354b0600cf094ad5b656115c3a1f0b436 (diff) | |
| download | chromium_src-3fec83dd87b54f18feb29759a4915948200fa84e.zip chromium_src-3fec83dd87b54f18feb29759a4915948200fa84e.tar.gz chromium_src-3fec83dd87b54f18feb29759a4915948200fa84e.tar.bz2 | |
Revert 136877 - Changes RootWindow capture code so that we only have one capture
type. Makes gesture generated mouse events use the right mouse
generating code so that we generate the correct enter/exit/moved
events and update the appropriate state.
BUG=115684
TEST=covered by unit tests
R=sadrul@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10391079
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10310146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/partial_screenshot_view.cc')
| -rw-r--r-- | ash/wm/partial_screenshot_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc index ce5a68f..1415441 100644 --- a/ash/wm/partial_screenshot_view.cc +++ b/ash/wm/partial_screenshot_view.cc @@ -59,7 +59,7 @@ void PartialScreenshotView::StartPartialScreenshot( widget->Show(); // Captures mouse events in case that context menu already captures the // events. This will close the context menu. - widget->GetNativeView()->SetCapture(); + widget->GetNativeView()->SetCapture(ui::CW_LOCK_MOUSE | ui::CW_LOCK_TOUCH); view->set_window(widget->GetNativeWindow()); Shell::GetInstance()->partial_screenshot_filter()->Activate(view); |