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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

Issue 131853005: Merge 244295 "Ensure that trackpad and trackpoint scrolling work..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1700_72/src/
Patch Set: Created 6 years, 11 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 #include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h"
6 6
7 #include "base/win/metro.h" 7 #include "base/win/metro.h"
8 #include "third_party/skia/include/core/SkPath.h" 8 #include "third_party/skia/include/core/SkPath.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 LPARAM l_param, 915 LPARAM l_param,
916 LRESULT* result) { 916 LRESULT* result) {
917 return false; 917 return false;
918 } 918 }
919 919
920 void DesktopRootWindowHostWin::PostHandleMSG(UINT message, 920 void DesktopRootWindowHostWin::PostHandleMSG(UINT message,
921 WPARAM w_param, 921 WPARAM w_param,
922 LPARAM l_param) { 922 LPARAM l_param) {
923 } 923 }
924 924
925 bool DesktopWindowTreeHostWin::HandleScrollEvent(
926 const ui::ScrollEvent& event) {
927 return delegate_->OnHostScrollEvent(const_cast<ui::ScrollEvent*>(&event));
928 }
929
925 //////////////////////////////////////////////////////////////////////////////// 930 ////////////////////////////////////////////////////////////////////////////////
926 // DesktopRootWindowHostWin, private: 931 // DesktopRootWindowHostWin, private:
927 932
928 Widget* DesktopRootWindowHostWin::GetWidget() { 933 Widget* DesktopRootWindowHostWin::GetWidget() {
929 return native_widget_delegate_->AsWidget(); 934 return native_widget_delegate_->AsWidget();
930 } 935 }
931 936
932 const Widget* DesktopRootWindowHostWin::GetWidget() const { 937 const Widget* DesktopRootWindowHostWin::GetWidget() const {
933 return native_widget_delegate_->AsWidget(); 938 return native_widget_delegate_->AsWidget();
934 } 939 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 971
967 // static 972 // static
968 DesktopRootWindowHost* DesktopRootWindowHost::Create( 973 DesktopRootWindowHost* DesktopRootWindowHost::Create(
969 internal::NativeWidgetDelegate* native_widget_delegate, 974 internal::NativeWidgetDelegate* native_widget_delegate,
970 DesktopNativeWidgetAura* desktop_native_widget_aura) { 975 DesktopNativeWidgetAura* desktop_native_widget_aura) {
971 return new DesktopRootWindowHostWin(native_widget_delegate, 976 return new DesktopRootWindowHostWin(native_widget_delegate,
972 desktop_native_widget_aura); 977 desktop_native_widget_aura);
973 } 978 }
974 979
975 } // namespace views 980 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_win.h ('k') | ui/views/widget/native_widget_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698