summaryrefslogtreecommitdiffstats
path: root/base/win_util.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 19:54:15 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 19:54:15 +0000
commite8a9a7472f544a839cbc47b8279d3ce99b0cf0a0 (patch)
tree8d784135c8791292a9413904f6b4dedbee89ab3a /base/win_util.cc
parent1e4a731e18cc375d537776576d379d4349c0b86c (diff)
downloadchromium_src-e8a9a7472f544a839cbc47b8279d3ce99b0cf0a0.zip
chromium_src-e8a9a7472f544a839cbc47b8279d3ce99b0cf0a0.tar.gz
chromium_src-e8a9a7472f544a839cbc47b8279d3ce99b0cf0a0.tar.bz2
Refactoring some of the NativeViewHost and NativeControl focus management so their consumers don't have to explicitly set the focused view.
BUG=None TEST=Run all tests. Make sure focus is stored/restored properly in Chrome. Review URL: http://codereview.chromium.org/214029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win_util.cc')
-rw-r--r--base/win_util.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/base/win_util.cc b/base/win_util.cc
index 37fc1ae..9b061bf 100644
--- a/base/win_util.cc
+++ b/base/win_util.cc
@@ -279,6 +279,8 @@ bool Subclass(HWND window, WNDPROC subclass_proc) {
WNDPROC original_handler =
reinterpret_cast<WNDPROC>(GetWindowLongPtr(window, GWLP_WNDPROC));
if (original_handler != subclass_proc) {
+ DCHECK(!GetProp(window, kHandlerKey)) << "subclassing a HWND more than "
+ "once";
win_util::SetWindowProc(window, subclass_proc);
SetProp(window, kHandlerKey, original_handler);
return true;