diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 04:58:43 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 04:58:43 +0000 |
| commit | 727cdda723471131820151e766ac30a79cf7214a (patch) | |
| tree | 0635a73818b3f5642ece6438d8bf45e0336d6e20 /views/window | |
| parent | 179cbaf54b1b96f5352b801d49daf2ffa663795a (diff) | |
| download | chromium_src-727cdda723471131820151e766ac30a79cf7214a.zip chromium_src-727cdda723471131820151e766ac30a79cf7214a.tar.gz chromium_src-727cdda723471131820151e766ac30a79cf7214a.tar.bz2 | |
Update OnMouseActivate override signatures.
Add OVERRIDE keyword liberally to some relevant overrides.
Fix copyright dates.
BUG=75366
TEST=Omnibox clicking, etc.
Review URL: http://codereview.chromium.org/6648018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
| -rw-r--r-- | views/window/window_win.h | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/views/window/window_win.h b/views/window/window_win.h index 2208405..5224f1f 100644 --- a/views/window/window_win.h +++ b/views/window/window_win.h @@ -122,30 +122,39 @@ class WindowWin : public WidgetWin, // Overridden from WidgetWin: virtual void OnActivate(UINT action, BOOL minimized, HWND window) OVERRIDE; virtual void OnActivateApp(BOOL active, DWORD thread_id) OVERRIDE; - virtual LRESULT OnAppCommand(HWND window, short app_command, WORD device, + virtual LRESULT OnAppCommand(HWND window, + short app_command, + WORD device, int keystate) OVERRIDE; - virtual void OnCommand(UINT notification_code, int command_id, HWND window) - OVERRIDE; + virtual void OnCommand(UINT notification_code, + int command_id, + HWND window) OVERRIDE; virtual void OnDestroy() OVERRIDE; - virtual LRESULT OnDwmCompositionChanged(UINT msg, WPARAM w_param, + virtual LRESULT OnDwmCompositionChanged(UINT msg, + WPARAM w_param, LPARAM l_param) OVERRIDE; virtual void OnFinalMessage(HWND window) OVERRIDE; virtual void OnGetMinMaxInfo(MINMAXINFO* minmax_info) OVERRIDE; virtual void OnInitMenu(HMENU menu) OVERRIDE; - virtual LRESULT OnMouseLeave(UINT message, WPARAM w_param, LPARAM l_param) - OVERRIDE; - virtual LRESULT OnMouseRange(UINT message, WPARAM w_param, LPARAM l_param) - OVERRIDE; + virtual LRESULT OnMouseLeave(UINT message, + WPARAM w_param, + LPARAM l_param) OVERRIDE; + virtual LRESULT OnMouseRange(UINT message, + WPARAM w_param, + LPARAM l_param) OVERRIDE; virtual LRESULT OnNCActivate(BOOL active) OVERRIDE; LRESULT OnNCCalcSize(BOOL mode, LPARAM l_param); // Don't override. virtual LRESULT OnNCHitTest(const CPoint& point) OVERRIDE; virtual void OnNCPaint(HRGN rgn) OVERRIDE; - virtual LRESULT OnNCMouseRange(UINT message, WPARAM w_param, LPARAM l_param) - OVERRIDE; - virtual LRESULT OnNCUAHDrawCaption(UINT msg, WPARAM w_param, LPARAM l_param) - OVERRIDE; - virtual LRESULT OnNCUAHDrawFrame(UINT msg, WPARAM w_param, LPARAM l_param) - OVERRIDE; + virtual LRESULT OnNCMouseRange(UINT message, + WPARAM w_param, + LPARAM l_param) OVERRIDE; + virtual LRESULT OnNCUAHDrawCaption(UINT msg, + WPARAM w_param, + LPARAM l_param) OVERRIDE; + virtual LRESULT OnNCUAHDrawFrame(UINT msg, + WPARAM w_param, + LPARAM l_param) OVERRIDE; virtual LRESULT OnSetIcon(UINT size_type, HICON new_icon) OVERRIDE; virtual LRESULT OnSetText(const wchar_t* text) OVERRIDE; virtual void OnSettingChange(UINT flags, const wchar_t* section) OVERRIDE; |