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

Side by Side Diff: win8/metro_driver/chrome_app_view_ash.h

Issue 15599002: Fix Ash on Windows multi-monitor support and snap-view sizing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup. Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 WIN8_METRO_DRIVER_CHROME_APP_VIEW_ASH_H_ 5 #ifndef WIN8_METRO_DRIVER_CHROME_APP_VIEW_ASH_H_
6 #define WIN8_METRO_DRIVER_CHROME_APP_VIEW_ASH_H_ 6 #define WIN8_METRO_DRIVER_CHROME_APP_VIEW_ASH_H_
7 7
8 #include <windows.applicationmodel.core.h> 8 #include <windows.applicationmodel.core.h>
9 #include <windows.ui.core.h> 9 #include <windows.ui.core.h>
10 #include <windows.ui.input.h> 10 #include <windows.ui.input.h>
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 HRESULT OnCharacterReceived(winui::Core::ICoreWindow* sender, 104 HRESULT OnCharacterReceived(winui::Core::ICoreWindow* sender,
105 winui::Core::ICharacterReceivedEventArgs* args); 105 winui::Core::ICharacterReceivedEventArgs* args);
106 106
107 HRESULT OnVisibilityChanged(winui::Core::ICoreWindow* sender, 107 HRESULT OnVisibilityChanged(winui::Core::ICoreWindow* sender,
108 winui::Core::IVisibilityChangedEventArgs* args); 108 winui::Core::IVisibilityChangedEventArgs* args);
109 109
110 HRESULT OnWindowActivated(winui::Core::ICoreWindow* sender, 110 HRESULT OnWindowActivated(winui::Core::ICoreWindow* sender,
111 winui::Core::IWindowActivatedEventArgs* args); 111 winui::Core::IWindowActivatedEventArgs* args);
112 112
113 HRESULT OnSizeChanged(winui::Core::ICoreWindow* sender,
114 winui::Core::IWindowSizeChangedEventArgs* args);
115
113 mswr::ComPtr<winui::Core::ICoreWindow> window_; 116 mswr::ComPtr<winui::Core::ICoreWindow> window_;
114 mswr::ComPtr<winapp::Core::ICoreApplicationView> view_; 117 mswr::ComPtr<winapp::Core::ICoreApplicationView> view_;
115 EventRegistrationToken activated_token_; 118 EventRegistrationToken activated_token_;
116 EventRegistrationToken pointermoved_token_; 119 EventRegistrationToken pointermoved_token_;
117 EventRegistrationToken pointerpressed_token_; 120 EventRegistrationToken pointerpressed_token_;
118 EventRegistrationToken pointerreleased_token_; 121 EventRegistrationToken pointerreleased_token_;
119 EventRegistrationToken wheel_token_; 122 EventRegistrationToken wheel_token_;
120 EventRegistrationToken keydown_token_; 123 EventRegistrationToken keydown_token_;
121 EventRegistrationToken keyup_token_; 124 EventRegistrationToken keyup_token_;
122 EventRegistrationToken character_received_token_; 125 EventRegistrationToken character_received_token_;
123 EventRegistrationToken visibility_changed_token_; 126 EventRegistrationToken visibility_changed_token_;
124 EventRegistrationToken accel_keydown_token_; 127 EventRegistrationToken accel_keydown_token_;
125 EventRegistrationToken accel_keyup_token_; 128 EventRegistrationToken accel_keyup_token_;
126 EventRegistrationToken window_activated_token_; 129 EventRegistrationToken window_activated_token_;
130 EventRegistrationToken sizechange_token_;
127 131
128 // Keep state about which button is currently down, if any, as PointerMoved 132 // Keep state about which button is currently down, if any, as PointerMoved
129 // events do not contain that state, but Ash's MouseEvents need it. 133 // events do not contain that state, but Ash's MouseEvents need it.
130 ui::EventFlags mouse_down_flags_; 134 ui::EventFlags mouse_down_flags_;
131 135
132 // Set the D3D swap chain and nothing else. 136 // Set the D3D swap chain and nothing else.
133 metro_driver::Direct3DHelper direct3d_helper_; 137 metro_driver::Direct3DHelper direct3d_helper_;
134 138
135 // The channel to Chrome, in particular to the MetroViewerProcessHost. 139 // The channel to Chrome, in particular to the MetroViewerProcessHost.
136 IPC::ChannelProxy* ui_channel_; 140 IPC::ChannelProxy* ui_channel_;
137 141
138 // The actual window behind the view surface. 142 // The actual window behind the view surface.
139 HWND core_window_hwnd_; 143 HWND core_window_hwnd_;
140 }; 144 };
141 145
142 #endif // WIN8_METRO_DRIVER_CHROME_APP_VIEW_ASH_H_ 146 #endif // WIN8_METRO_DRIVER_CHROME_APP_VIEW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698