summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/constrained_window_win.h
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-09 04:58:43 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-09 04:58:43 +0000
commit727cdda723471131820151e766ac30a79cf7214a (patch)
tree0635a73818b3f5642ece6438d8bf45e0336d6e20 /chrome/browser/ui/views/constrained_window_win.h
parent179cbaf54b1b96f5352b801d49daf2ffa663795a (diff)
downloadchromium_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 'chrome/browser/ui/views/constrained_window_win.h')
-rw-r--r--chrome/browser/ui/views/constrained_window_win.h21
1 files changed, 12 insertions, 9 deletions
diff --git a/chrome/browser/ui/views/constrained_window_win.h b/chrome/browser/ui/views/constrained_window_win.h
index f6b6733..1875901 100644
--- a/chrome/browser/ui/views/constrained_window_win.h
+++ b/chrome/browser/ui/views/constrained_window_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -33,21 +33,24 @@ class ConstrainedWindowWin : public ConstrainedWindow,
TabContents* owner() const { return owner_; }
// Overridden from views::Window:
- virtual views::NonClientFrameView* CreateFrameViewForWindow();
+ virtual views::NonClientFrameView* CreateFrameViewForWindow() OVERRIDE;
// Overridden from ConstrainedWindow:
- virtual void ShowConstrainedWindow();
- virtual void CloseConstrainedWindow();
- virtual void FocusConstrainedWindow();
+ virtual void ShowConstrainedWindow() OVERRIDE;
+ virtual void CloseConstrainedWindow() OVERRIDE;
+ virtual void FocusConstrainedWindow() OVERRIDE;
+
virtual std::wstring GetWindowTitle() const;
virtual const gfx::Rect& GetCurrentBounds() const;
protected:
// Windows message handlers:
- virtual void OnDestroy();
- virtual void OnFinalMessage(HWND window);
- virtual LRESULT OnMouseActivate(HWND window, UINT hittest_code, UINT message);
- virtual void OnWindowPosChanged(WINDOWPOS* window_pos);
+ virtual void OnDestroy() OVERRIDE;
+ virtual void OnFinalMessage(HWND window) OVERRIDE;
+ virtual LRESULT OnMouseActivate(UINT message,
+ WPARAM w_param,
+ LPARAM l_param) OVERRIDE;
+ virtual void OnWindowPosChanged(WINDOWPOS* window_pos) OVERRIDE;
private:
friend class ConstrainedWindow;