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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 134683004: Disabled pinch zooming in non-browser Aura windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 event.wheelTicksY && 1149 event.wheelTicksY &&
1150 (event.modifiers & blink::WebInputEvent::ControlKey)) { 1150 (event.modifiers & blink::WebInputEvent::ControlKey)) {
1151 delegate_->ContentsZoomChange(event.wheelTicksY > 0); 1151 delegate_->ContentsZoomChange(event.wheelTicksY > 0);
1152 return true; 1152 return true;
1153 } 1153 }
1154 #endif 1154 #endif
1155 1155
1156 return false; 1156 return false;
1157 } 1157 }
1158 1158
1159 bool WebContentsImpl::PreHandleGestureEvent(
1160 const blink::WebGestureEvent& event) {
1161 return delegate_->PreHandleGestureEvent(this, event);
1162 }
1163
1159 #if defined(OS_WIN) 1164 #if defined(OS_WIN)
1160 gfx::NativeViewAccessible WebContentsImpl::GetParentNativeViewAccessible() { 1165 gfx::NativeViewAccessible WebContentsImpl::GetParentNativeViewAccessible() {
1161 return accessible_parent_; 1166 return accessible_parent_;
1162 } 1167 }
1163 #endif 1168 #endif
1164 1169
1165 void WebContentsImpl::HandleMouseDown() { 1170 void WebContentsImpl::HandleMouseDown() {
1166 if (delegate_) 1171 if (delegate_)
1167 delegate_->HandleMouseDown(); 1172 delegate_->HandleMouseDown();
1168 } 1173 }
(...skipping 2561 matching lines...) Expand 10 before | Expand all | Expand 10 after
3730 } 3735 }
3731 3736
3732 void WebContentsImpl::OnFrameRemoved( 3737 void WebContentsImpl::OnFrameRemoved(
3733 RenderViewHostImpl* render_view_host, 3738 RenderViewHostImpl* render_view_host,
3734 int64 frame_id) { 3739 int64 frame_id) {
3735 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 3740 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
3736 FrameDetached(render_view_host, frame_id)); 3741 FrameDetached(render_view_host, frame_id));
3737 } 3742 }
3738 3743
3739 } // namespace content 3744 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/public/browser/web_contents_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698