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

Side by Side Diff: ui/gfx/win/direct_manipulation.h

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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_WIN_DIRECT_MANIPULATION_H_ 5 #ifndef UI_GFX_WIN_DIRECT_MANIPULATION_H_
6 #define UI_GFX_WIN_DIRECT_MANIPULATION_H_ 6 #define UI_GFX_WIN_DIRECT_MANIPULATION_H_
7 7
8 #include <directmanipulation.h> 8 #include <directmanipulation.h>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 // This function instantiates Direct Manipulation and creates a viewport for 46 // This function instantiates Direct Manipulation and creates a viewport for
47 // the passed in |window|. 47 // the passed in |window|.
48 // consumer. Most of the code is boiler plate and is based on the sample. 48 // consumer. Most of the code is boiler plate and is based on the sample.
49 void Initialize(HWND window); 49 void Initialize(HWND window);
50 50
51 // Sets the bounds of the fake Direct manipulation viewport to match those 51 // Sets the bounds of the fake Direct manipulation viewport to match those
52 // of the legacy window. 52 // of the legacy window.
53 void SetBounds(const gfx::Rect& bounds); 53 void SetBounds(const gfx::Rect& bounds);
54 54
55 // Registers the passed in |window| as a Direct Manipulation consumer. 55 // Registers and activates the passed in |window| as a Direct Manipulation
56 // consumer.
56 void Activate(HWND window); 57 void Activate(HWND window);
57 58
59 // Deactivates Direct Manipulation processing on the passed in |window|.
60 void Deactivate(HWND window);
61
58 // Passes the WM_MOUSEWHEEL messages to Direct Manipulation. This is for 62 // Passes the WM_MOUSEWHEEL messages to Direct Manipulation. This is for
59 // logistics purposes. 63 // logistics purposes.
60 void HandleMouseWheel(HWND window, UINT message, WPARAM w_param, 64 void HandleMouseWheel(HWND window, UINT message, WPARAM w_param,
61 LPARAM l_param); 65 LPARAM l_param);
62 66
63 ~DirectManipulationHelper(); 67 ~DirectManipulationHelper();
64 68
65 private: 69 private:
66 DirectManipulationHelper(); 70 DirectManipulationHelper();
67 71
68 base::win::ScopedComPtr<IDirectManipulationManager2> manager_; 72 base::win::ScopedComPtr<IDirectManipulationManager2> manager_;
69 base::win::ScopedComPtr<IDirectManipulationCompositor> compositor_; 73 base::win::ScopedComPtr<IDirectManipulationCompositor> compositor_;
70 base::win::ScopedComPtr<IDirectManipulationUpdateManager> update_manager_; 74 base::win::ScopedComPtr<IDirectManipulationUpdateManager> update_manager_;
71 base::win::ScopedComPtr<IDirectManipulationFrameInfoProvider> frame_info_; 75 base::win::ScopedComPtr<IDirectManipulationFrameInfoProvider> frame_info_;
72 base::win::ScopedComPtr<IDirectManipulationViewport2> view_port_outer_; 76 base::win::ScopedComPtr<IDirectManipulationViewport2> view_port_outer_;
73 77
74 DISALLOW_COPY_AND_ASSIGN(DirectManipulationHelper); 78 DISALLOW_COPY_AND_ASSIGN(DirectManipulationHelper);
75 }; 79 };
76 80
77 } // namespace win 81 } // namespace win
78 } // namespace gfx 82 } // namespace gfx
79 83
80 #endif // UI_GFX_WIN_DIRECT_MANIPULATION_H_ 84 #endif // UI_GFX_WIN_DIRECT_MANIPULATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698