summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatthewyuan <matthewyuan@google.com>2014-11-11 10:01:54 -0800
committermatthewyuan <matthewyuan@google.com>2014-11-11 18:02:35 +0000
commitc8ae2b86ab9a2fb8a4f9fed49ea92ec41c95019f (patch)
tree76fb14d56b3c1f9fbb1e84001f520ad94196d2f7
parent60cd448653554a68f7ba637fc1821e83b383a4ce (diff)
downloadchromium_src-c8ae2b86ab9a2fb8a4f9fed49ea92ec41c95019f.zip
chromium_src-c8ae2b86ab9a2fb8a4f9fed49ea92ec41c95019f.tar.gz
chromium_src-c8ae2b86ab9a2fb8a4f9fed49ea92ec41c95019f.tar.bz2
Reverting cl since it's causing a crash.
BUG=431639 Revert "Fixed detection of WS_OVERLAPPED windows, bug introduced in change 6561311." This reverts commit 26b57c28c3d5d0b540095a0e081bf303163ea76b. R=brucedawson@chromium.org Review URL: https://codereview.chromium.org/720443003 Cr-Commit-Position: refs/branch-heads/2214@{#10} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
-rw-r--r--ui/views/win/hwnd_message_handler.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index fe562a7..08e337f 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -871,8 +871,7 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
void HWNDMessageHandler::SizeConstraintsChanged() {
LONG style = GetWindowLong(hwnd(), GWL_STYLE);
// Ignore if this is not a standard window.
- // WS_OVERLAPPED is just the *absence* of WS_POPUP and WS_CHILD.
- if ((style & (WS_POPUP | WS_CHILD)) == WS_OVERLAPPED)
+ if (!(style & WS_OVERLAPPED))
return;
if (delegate_->CanResize()) {