Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Unified Diff: ui/views/win/hwnd_message_handler.cc

Issue 1295683003: Remove the CHECK from the DirectManipulationHelper::Activate function as it is firing in Canary on … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address sky review comments Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/win/hwnd_message_handler.cc
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 41ec2d1e48cf27e2cf0f4311cb7ba4ad244d096c..b394556ee2943a4c74837aa3e1ff4547c81c9347 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -2520,10 +2520,15 @@ void HWNDMessageHandler::OnWindowPosChanged(WINDOWPOS* window_pos) {
MARGINS m = {10, 10, 10, 10};
DwmExtendFrameIntoClientArea(hwnd(), &m);
}
- if (window_pos->flags & SWP_SHOWWINDOW)
+ if (window_pos->flags & SWP_SHOWWINDOW) {
delegate_->HandleVisibilityChanged(true);
- else if (window_pos->flags & SWP_HIDEWINDOW)
+ if (direct_manipulation_helper_)
+ direct_manipulation_helper_->Activate(hwnd());
+ } else if (window_pos->flags & SWP_HIDEWINDOW) {
delegate_->HandleVisibilityChanged(false);
+ if (direct_manipulation_helper_)
+ direct_manipulation_helper_->Deactivate(hwnd());
+ }
SetMsgHandled(FALSE);
}

Powered by Google App Engine
This is Rietveld 408576698