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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_win.cc

Issue 7618036: mac: Only let two-finger-scrolling trigger history if web doesn't swallow gesture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: TestRenderViewHost Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_widget_host_view_win.h" 5 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 CHECK(!animate); 757 CHECK(!animate);
758 758
759 SkColor overlay_color = color ? *color : 0; 759 SkColor overlay_color = color ? *color : 0;
760 if (overlay_color_ == overlay_color) 760 if (overlay_color_ == overlay_color)
761 return; 761 return;
762 overlay_color_ = overlay_color; 762 overlay_color_ = overlay_color;
763 763
764 InvalidateRect(NULL, FALSE); 764 InvalidateRect(NULL, FALSE);
765 } 765 }
766 766
767 void RenderWidgetHostViewWin::UnhandledWheelEvent(
768 const WebKit::WebMouseWheelEvent& event) {
769 }
770
771 void RenderWidgetHostViewWin::SetHasHorizontalScrollbar(
772 bool has_horizontal_scrollbar) {
773 }
774
775 void RenderWidgetHostViewWin::SetScrollOffsetPinning(
776 bool is_pinned_to_left, bool is_pinned_to_right) {
777 }
778
767 /////////////////////////////////////////////////////////////////////////////// 779 ///////////////////////////////////////////////////////////////////////////////
768 // RenderWidgetHostViewWin, private: 780 // RenderWidgetHostViewWin, private:
769 781
770 LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) { 782 LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) {
771 // Call the WM_INPUTLANGCHANGE message handler to initialize the input locale 783 // Call the WM_INPUTLANGCHANGE message handler to initialize the input locale
772 // of a browser process. 784 // of a browser process.
773 OnInputLangChange(0, 0); 785 OnInputLangChange(0, 0);
774 // Marks that window as supporting mouse-wheel messages rerouting so it is 786 // Marks that window as supporting mouse-wheel messages rerouting so it is
775 // scrolled when under the mouse pointer even if inactive. 787 // scrolled when under the mouse pointer even if inactive.
776 props_.push_back(views::SetWindowSupportsRerouteMouseWheel(m_hWnd)); 788 props_.push_back(views::SetWindowSupportsRerouteMouseWheel(m_hWnd));
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
1827 DWORD ex_style) { 1839 DWORD ex_style) {
1828 parent_hwnd_ = parent_hwnd; 1840 parent_hwnd_ = parent_hwnd;
1829 Create(parent_hwnd_, NULL, NULL, WS_POPUP, ex_style); 1841 Create(parent_hwnd_, NULL, NULL, WS_POPUP, ex_style);
1830 MoveWindow(pos.x(), pos.y(), pos.width(), pos.height(), TRUE); 1842 MoveWindow(pos.x(), pos.y(), pos.width(), pos.height(), TRUE);
1831 // To show tooltip on popup window.(e.g. title in <select>) 1843 // To show tooltip on popup window.(e.g. title in <select>)
1832 // Popups default to showing, which means |DidBecomeSelected()| isn't invoked. 1844 // Popups default to showing, which means |DidBecomeSelected()| isn't invoked.
1833 // Ensure the tooltip is created otherwise tooltips are never shown. 1845 // Ensure the tooltip is created otherwise tooltips are never shown.
1834 EnsureTooltip(); 1846 EnsureTooltip();
1835 ShowWindow(IsActivatable() ? SW_SHOW : SW_SHOWNA); 1847 ShowWindow(IsActivatable() ? SW_SHOW : SW_SHOWNA);
1836 } 1848 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_win.h ('k') | chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698