summaryrefslogtreecommitdiffstats
path: root/views/window/window_win.h
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-05 05:02:43 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-05 05:02:43 +0000
commit1255a3e4bb4f30978c79497e4f05db615e197505 (patch)
treed1575c5c0ae3672dd379d6d67838c673b4d7824e /views/window/window_win.h
parent5ce3da1ef045e25ef4c34cfc925fb8a48ad2e87c (diff)
downloadchromium_src-1255a3e4bb4f30978c79497e4f05db615e197505.zip
chromium_src-1255a3e4bb4f30978c79497e4f05db615e197505.tar.gz
chromium_src-1255a3e4bb4f30978c79497e4f05db615e197505.tar.bz2
Support app menu and double-click close on upper left corner of window, part one.
This makes things work right for windows that have an icon. The behavior of the main window is unchanged because right now it never returns HTSYSMENU anywhere. Part two of this change will be figuring out how to return that at the right place, which will make things Just Work. BUG=6961 TEST=Open an app or popup window. Single click the icon. The app menu should appear. Close it, then click-and-drag into the app menu. The item you release on should execute. Double-click the icon. The window should close. Review URL: http://codereview.chromium.org/577018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window/window_win.h')
-rw-r--r--views/window/window_win.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/views/window/window_win.h b/views/window/window_win.h
index 12e3d2e..02812aa 100644
--- a/views/window/window_win.h
+++ b/views/window/window_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -108,9 +108,6 @@ class WindowWin : public WidgetWin,
// crazily complicated.
virtual gfx::Insets GetClientAreaInsets() const;
- // Shows the system menu at the specified screen point.
- void RunSystemMenu(const gfx::Point& point);
-
// Overridden from WidgetWin:
virtual void OnActivate(UINT action, BOOL minimized, HWND window);
virtual void OnActivateApp(BOOL active, DWORD thread_id);
@@ -129,9 +126,7 @@ class WindowWin : public WidgetWin,
virtual LRESULT OnNCHitTest(const CPoint& point);
virtual void OnNCPaint(HRGN rgn);
virtual void OnNCLButtonDown(UINT ht_component, const CPoint& point);
- virtual void OnNCLButtonUp(UINT ht_component, const CPoint& point);
virtual void OnNCRButtonDown(UINT ht_component, const CPoint& point);
- virtual void OnNCRButtonUp(UINT ht_component, const CPoint& point);
virtual void OnRButtonUp(UINT ht_component, const CPoint& point);
virtual LRESULT OnNCUAHDrawCaption(UINT msg, WPARAM w_param, LPARAM l_param);
virtual LRESULT OnNCUAHDrawFrame(UINT msg, WPARAM w_param, LPARAM l_param);
@@ -294,12 +289,6 @@ class WindowWin : public WidgetWin,
// area. We need this so we can correctly show the context menu on mouse-up.
bool is_right_mouse_pressed_on_caption_;
- // With our current behavior when we track popup menu we capture the mouse
- // so doubleclick does not work. If user doubleclicks on the system icon
- // the menu will be canceled and user will receive WM_NCLBUTTONUP.
- // So we store the last time system menu was opened and canceled
- DWORD last_time_system_menu_clicked_;
-
// The last-seen monitor containing us, and its rect and work area. These are
// used to catch updates to the rect and work area and react accordingly.
HMONITOR last_monitor_;