diff options
author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 17:42:32 +0000 |
---|---|---|
committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 17:42:32 +0000 |
commit | 7c3b7003d5f513a2608ec6586901d6367a21b0e6 (patch) | |
tree | c50d5350c229404c9e6484e5ac04b5ac44a8544c /win8/metro_driver/chrome_app_view.h | |
parent | 3c17ae74d8ead9a9117c7837f832da0d02a225fa (diff) | |
download | chromium_src-7c3b7003d5f513a2608ec6586901d6367a21b0e6.zip chromium_src-7c3b7003d5f513a2608ec6586901d6367a21b0e6.tar.gz chromium_src-7c3b7003d5f513a2608ec6586901d6367a21b0e6.tar.bz2 |
Split ash and non-ash metro driver code
ChromeAppViewFactory now produces ChromeAppView or ChromeAppViewAsh depending on the use_aura gyp flag.
The two versions have very little in common. Overt time they might share more code.
BUG=151718
TEST=see bug
Review URL: https://codereview.chromium.org/11233070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver/chrome_app_view.h')
-rw-r--r-- | win8/metro_driver/chrome_app_view.h | 41 |
1 files changed, 3 insertions, 38 deletions
diff --git a/win8/metro_driver/chrome_app_view.h b/win8/metro_driver/chrome_app_view.h index 3ca5e2b..248d177 100644 --- a/win8/metro_driver/chrome_app_view.h +++ b/win8/metro_driver/chrome_app_view.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_METRO_DRIVER_CHROME_APP_VIEW_H_ -#define CHROME_BROWSER_UI_METRO_DRIVER_CHROME_APP_VIEW_H_ +#ifndef WIN8_METRO_DRIVER_CHROME_APP_VIEW_H_ +#define WIN8_METRO_DRIVER_CHROME_APP_VIEW_H_ #include <windows.applicationmodel.core.h> #include <windows.ui.core.h> @@ -20,7 +20,6 @@ #include "base/synchronization/lock.h" #include "win8/metro_driver/chrome_url_launch_handler.h" #include "win8/metro_driver/devices_handler.h" -#include "win8/metro_driver/direct3d_helper.h" #include "win8/metro_driver/metro_dialog_box.h" #include "win8/metro_driver/settings_handler.h" #include "win8/metro_driver/toast_notification_handler.h" @@ -82,21 +81,6 @@ class ChromeAppView HRESULT OnSizeChanged(winui::Core::ICoreWindow* sender, winui::Core::IWindowSizeChangedEventArgs* args); - HRESULT OnPointerMoved(winui::Core::ICoreWindow* sender, - winui::Core::IPointerEventArgs* args); - - HRESULT OnPointerPressed(winui::Core::ICoreWindow* sender, - winui::Core::IPointerEventArgs* args); - - HRESULT OnPointerReleased(winui::Core::ICoreWindow* sender, - winui::Core::IPointerEventArgs* args); - - HRESULT OnKeyDown(winui::Core::ICoreWindow* sender, - winui::Core::IKeyEventArgs* args); - - HRESULT OnKeyUp(winui::Core::ICoreWindow* sender, - winui::Core::IKeyEventArgs* args); - HRESULT OnEdgeGestureCompleted(winui::Input::IEdgeGesture* gesture, winui::Input::IEdgeGestureEventArgs* args); @@ -130,11 +114,6 @@ class ChromeAppView EventRegistrationToken input_pane_visible_token_; EventRegistrationToken input_pane_hiding_token_; EventRegistrationToken app_exit_token_; - EventRegistrationToken pointermoved_token_; - EventRegistrationToken pointerpressed_token_; - EventRegistrationToken pointerreleased_token_; - EventRegistrationToken keydown_token_; - EventRegistrationToken keyup_token_; ChromeUrlLaunchHandler url_launch_handler_; metro_driver::DevicesHandler devices_handler_; @@ -158,20 +137,6 @@ class ChromeAppView int osk_offset_adjustment_; MetroDialogBox dialog_box_; - - metro_driver::Direct3DHelper direct3d_helper_; - - IPC::Listener* ui_channel_listener_; - IPC::ChannelProxy* ui_channel_; -}; - -class ChromeAppViewFactory - : public mswr::RuntimeClass<winapp::Core::IFrameworkViewSource> { - public: - ChromeAppViewFactory(winapp::Core::ICoreApplication* icore_app, - LPTHREAD_START_ROUTINE host_main, - void* host_context); - IFACEMETHOD(CreateView)(winapp::Core::IFrameworkView** view); }; // This function is exported by chrome.exe. @@ -205,4 +170,4 @@ struct Globals { extern Globals globals; -#endif // CHROME_BROWSER_UI_METRO_DRIVER_CHROME_APP_VIEW_H_ +#endif // WIN8_METRO_DRIVER_CHROME_APP_VIEW_H_ |