diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 18:12:09 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 18:12:09 +0000 |
| commit | 63b8201d4abcbfcc9d27ce3b410e6206e19d64c5 (patch) | |
| tree | c35d6a8f0f9afcd66dfa31f3db8d0643074ac8ea /views/widget/widget_win.h | |
| parent | 063002ca22759a0f70108956dd5f4c0a74d8fcda (diff) | |
| download | chromium_src-63b8201d4abcbfcc9d27ce3b410e6206e19d64c5.zip chromium_src-63b8201d4abcbfcc9d27ce3b410e6206e19d64c5.tar.gz chromium_src-63b8201d4abcbfcc9d27ce3b410e6206e19d64c5.tar.bz2 | |
Re-lands:
Add native capture API to Widget, and fix a bug in Window where we wouldn't let the window be closed from the X.
BUG=72040
TEST=none
R=sky
Review URL: http://codereview.chromium.org/6670049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/widget_win.h')
| -rw-r--r-- | views/widget/widget_win.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h index 9779bd8..47863c7 100644 --- a/views/widget/widget_win.h +++ b/views/widget/widget_win.h @@ -142,11 +142,6 @@ class WidgetWin : public ui::WindowImpl, return ::ShowWindow(GetNativeView(), command); } - HWND SetCapture() { - DCHECK(::IsWindow(GetNativeView())); - return ::SetCapture(GetNativeView()); - } - HWND GetParent() const { return ::GetParent(GetNativeView()); } @@ -208,6 +203,9 @@ class WidgetWin : public ui::WindowImpl, virtual void* GetNativeWindowProperty(const char* name) OVERRIDE; virtual TooltipManager* GetTooltipManager() const OVERRIDE; virtual bool IsScreenReaderActive() const OVERRIDE; + virtual void SetNativeCapture() OVERRIDE; + virtual void ReleaseNativeCapture() OVERRIDE; + virtual bool HasNativeCapture() const OVERRIDE; virtual gfx::Rect GetWindowScreenBounds() const OVERRIDE; virtual gfx::Rect GetClientAreaScreenBounds() const OVERRIDE; virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; @@ -416,9 +414,6 @@ class WidgetWin : public ui::WindowImpl, scoped_refptr<DropTargetWin> drop_target_; - // Whether or not we have capture the mouse. - bool has_capture_; - // If true, the mouse is currently down. bool is_mouse_down_; |