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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_views.h

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 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 const gfx::Point& end) OVERRIDE; 85 const gfx::Point& end) OVERRIDE;
86 virtual void ShowingContextMenu(bool showing) OVERRIDE; 86 virtual void ShowingContextMenu(bool showing) OVERRIDE;
87 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE; 87 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;
88 virtual void SetBackground(const SkBitmap& background) OVERRIDE; 88 virtual void SetBackground(const SkBitmap& background) OVERRIDE;
89 #if defined(TOOLKIT_USES_GTK) 89 #if defined(TOOLKIT_USES_GTK)
90 virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE; 90 virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE;
91 virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE; 91 virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE;
92 #endif 92 #endif
93 virtual void SetVisuallyDeemphasized(const SkColor* color, 93 virtual void SetVisuallyDeemphasized(const SkColor* color,
94 bool animate) OVERRIDE; 94 bool animate) OVERRIDE;
95 virtual void UnhandledWheelEvent(
96 const WebKit::WebMouseWheelEvent& event) OVERRIDE;
97 virtual void SetHasHorizontalScrollbar(
98 bool has_horizontal_scrollbar) OVERRIDE;
99 virtual void SetScrollOffsetPinning(
100 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
95 #if defined(TOOLKIT_USES_GTK) 101 #if defined(TOOLKIT_USES_GTK)
96 virtual void AcceleratedCompositingActivated(bool activated) OVERRIDE; 102 virtual void AcceleratedCompositingActivated(bool activated) OVERRIDE;
97 #endif 103 #endif
98 #if defined(OS_WIN) 104 #if defined(OS_WIN)
99 virtual void WillWmDestroy() OVERRIDE; 105 virtual void WillWmDestroy() OVERRIDE;
100 virtual void ShowCompositorHostWindow(bool show) OVERRIDE; 106 virtual void ShowCompositorHostWindow(bool show) OVERRIDE;
101 #endif 107 #endif
102 virtual gfx::PluginWindowHandle GetCompositingSurface() OVERRIDE; 108 virtual gfx::PluginWindowHandle GetCompositingSurface() OVERRIDE;
103 109
104 // Overridden from views::TouchSelectionClientView. 110 // Overridden from views::TouchSelectionClientView.
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 265
260 #if defined(TOUCH_UI) 266 #if defined(TOUCH_UI)
261 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> > 267 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> >
262 accelerated_surface_containers_; 268 accelerated_surface_containers_;
263 #endif 269 #endif
264 270
265 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews); 271 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews);
266 }; 272 };
267 273
268 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 274 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698