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

Side by Side Diff: content/browser/web_contents/web_contents_view_win.h

Issue 12221144: Make zoom using ctrl+mouse wheel work in win aura. Windows -non-aura had a hack that was a layering… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
(...skipping 25 matching lines...) Expand all
36 virtual ~WebContentsViewWin(); 36 virtual ~WebContentsViewWin();
37 37
38 BEGIN_MSG_MAP_EX(WebContentsViewWin) 38 BEGIN_MSG_MAP_EX(WebContentsViewWin)
39 MESSAGE_HANDLER(WM_CREATE, OnCreate) 39 MESSAGE_HANDLER(WM_CREATE, OnCreate)
40 MESSAGE_HANDLER(WM_DESTROY, OnDestroy) 40 MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
41 MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) 41 MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged)
42 MESSAGE_HANDLER(WM_LBUTTONDOWN, OnMouseDown) 42 MESSAGE_HANDLER(WM_LBUTTONDOWN, OnMouseDown)
43 MESSAGE_HANDLER(WM_MBUTTONDOWN, OnMouseDown) 43 MESSAGE_HANDLER(WM_MBUTTONDOWN, OnMouseDown)
44 MESSAGE_HANDLER(WM_RBUTTONDOWN, OnMouseDown) 44 MESSAGE_HANDLER(WM_RBUTTONDOWN, OnMouseDown)
45 MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) 45 MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove)
46 MESSAGE_HANDLER(base::win::kReflectedMessage, OnReflectedMessage)
47 // Hacks for old ThinkPad touchpads/scroll points. 46 // Hacks for old ThinkPad touchpads/scroll points.
48 MESSAGE_HANDLER(WM_NCCALCSIZE, OnNCCalcSize) 47 MESSAGE_HANDLER(WM_NCCALCSIZE, OnNCCalcSize)
49 MESSAGE_HANDLER(WM_NCHITTEST, OnNCHitTest) 48 MESSAGE_HANDLER(WM_NCHITTEST, OnNCHitTest)
50 MESSAGE_HANDLER(WM_HSCROLL, OnScroll) 49 MESSAGE_HANDLER(WM_HSCROLL, OnScroll)
51 MESSAGE_HANDLER(WM_VSCROLL, OnScroll) 50 MESSAGE_HANDLER(WM_VSCROLL, OnScroll)
52 MESSAGE_HANDLER(WM_SIZE, OnSize) 51 MESSAGE_HANDLER(WM_SIZE, OnSize)
53 END_MSG_MAP() 52 END_MSG_MAP()
54 53
55 // Overridden from WebContentsView: 54 // Overridden from WebContentsView:
56 virtual void CreateView( 55 virtual void CreateView(
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 scoped_refptr<WebContentsDragWin> drag_handler_; 138 scoped_refptr<WebContentsDragWin> drag_handler_;
140 139
141 scoped_ptr<ui::HWNDMessageFilter> hwnd_message_filter_; 140 scoped_ptr<ui::HWNDMessageFilter> hwnd_message_filter_;
142 141
143 DISALLOW_COPY_AND_ASSIGN(WebContentsViewWin); 142 DISALLOW_COPY_AND_ASSIGN(WebContentsViewWin);
144 }; 143 };
145 144
146 } // namespace content 145 } // namespace content
147 146
148 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_ 147 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/browser/web_contents/web_contents_view_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698