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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_views.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_views.h" 5 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 RenderWidgetHostView::SetBackground(background); 328 RenderWidgetHostView::SetBackground(background);
329 if (host_) 329 if (host_)
330 host_->Send(new ViewMsg_SetBackground(host_->routing_id(), background)); 330 host_->Send(new ViewMsg_SetBackground(host_->routing_id(), background));
331 } 331 }
332 332
333 void RenderWidgetHostViewViews::SetVisuallyDeemphasized( 333 void RenderWidgetHostViewViews::SetVisuallyDeemphasized(
334 const SkColor* color, bool animate) { 334 const SkColor* color, bool animate) {
335 // TODO(anicolao) 335 // TODO(anicolao)
336 } 336 }
337 337
338 void RenderWidgetHostViewViews::UnhandledWheelEvent(
339 const WebKit::WebMouseWheelEvent& event) {
340 }
341
342 void RenderWidgetHostViewViews::SetHasHorizontalScrollbar(
343 bool has_horizontal_scrollbar) {
344 }
345
346 void RenderWidgetHostViewViews::SetScrollOffsetPinning(
347 bool is_pinned_to_left, bool is_pinned_to_right) {
348 }
349
338 void RenderWidgetHostViewViews::SelectRect(const gfx::Point& start, 350 void RenderWidgetHostViewViews::SelectRect(const gfx::Point& start,
339 const gfx::Point& end) { 351 const gfx::Point& end) {
340 if (host_) 352 if (host_)
341 host_->Send(new ViewMsg_SelectRange(host_->routing_id(), start, end)); 353 host_->Send(new ViewMsg_SelectRange(host_->routing_id(), start, end));
342 } 354 }
343 355
344 bool RenderWidgetHostViewViews::IsCommandIdChecked(int command_id) const { 356 bool RenderWidgetHostViewViews::IsCommandIdChecked(int command_id) const {
345 // TODO(varunjain): implement this and other menu delegate methods. 357 // TODO(varunjain): implement this and other menu delegate methods.
346 NOTREACHED(); 358 NOTREACHED();
347 return true; 359 return true;
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 776
765 void RenderWidgetHostViewViews::FinishImeCompositionSession() { 777 void RenderWidgetHostViewViews::FinishImeCompositionSession() {
766 if (!has_composition_text_) 778 if (!has_composition_text_)
767 return; 779 return;
768 if (host_) 780 if (host_)
769 host_->ImeConfirmComposition(); 781 host_->ImeConfirmComposition();
770 DCHECK(GetInputMethod()); 782 DCHECK(GetInputMethod());
771 GetInputMethod()->CancelComposition(this); 783 GetInputMethod()->CancelComposition(this);
772 has_composition_text_ = false; 784 has_composition_text_ = false;
773 } 785 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698