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

Unified Diff: ui/gfx/win/direct_manipulation.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: Add SetMsgHandled to the windowpos changed handler 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
« no previous file with comments | « ui/gfx/win/direct_manipulation.h ('k') | ui/views/win/hwnd_message_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/win/direct_manipulation.cc
diff --git a/ui/gfx/win/direct_manipulation.cc b/ui/gfx/win/direct_manipulation.cc
index f7f4aa5a36b8897e2dfe829b5f8b8af6aa10608a..2014c7088544c26b0ec188b78011d4f989c7e208 100644
--- a/ui/gfx/win/direct_manipulation.cc
+++ b/ui/gfx/win/direct_manipulation.cc
@@ -91,8 +91,12 @@ void DirectManipulationHelper::SetBounds(const gfx::Rect& bounds) {
void DirectManipulationHelper::Activate(HWND window) {
DCHECK(::IsWindow(window));
- HRESULT hr = manager_->Activate(window);
- CHECK(SUCCEEDED(hr));
+ manager_->Activate(window);
+}
+
+void DirectManipulationHelper::Deactivate(HWND window) {
+ DCHECK(::IsWindow(window));
+ manager_->Deactivate(window);
}
void DirectManipulationHelper:: HandleMouseWheel(HWND window, UINT message,
« no previous file with comments | « ui/gfx/win/direct_manipulation.h ('k') | ui/views/win/hwnd_message_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698