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

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, 11 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 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1230 event.wheelTicksY && 1230 event.wheelTicksY &&
1231 (event.modifiers & blink::WebInputEvent::ControlKey)) { 1231 (event.modifiers & blink::WebInputEvent::ControlKey)) {
1232 delegate_->ContentsZoomChange(event.wheelTicksY > 0); 1232 delegate_->ContentsZoomChange(event.wheelTicksY > 0);
1233 return true; 1233 return true;
1234 } 1234 }
1235 #endif 1235 #endif
1236 1236
1237 return false; 1237 return false;
1238 } 1238 }
1239 1239
1240 bool WebContentsImpl::PreHandleGestureEvent(
1241 const blink::WebGestureEvent& event) {
1242 return delegate_->PreHandleGestureEvent(this, event);
1243 }
1244
1240 #if defined(OS_WIN) 1245 #if defined(OS_WIN)
1241 gfx::NativeViewAccessible WebContentsImpl::GetParentNativeViewAccessible() { 1246 gfx::NativeViewAccessible WebContentsImpl::GetParentNativeViewAccessible() {
1242 return accessible_parent_; 1247 return accessible_parent_;
1243 } 1248 }
1244 #endif 1249 #endif
1245 1250
1246 void WebContentsImpl::HandleMouseDown() { 1251 void WebContentsImpl::HandleMouseDown() {
1247 if (delegate_) 1252 if (delegate_)
1248 delegate_->HandleMouseDown(); 1253 delegate_->HandleMouseDown();
1249 } 1254 }
(...skipping 2589 matching lines...) Expand 10 before | Expand all | Expand 10 after
3839 } 3844 }
3840 3845
3841 void WebContentsImpl::OnFrameRemoved( 3846 void WebContentsImpl::OnFrameRemoved(
3842 RenderViewHostImpl* render_view_host, 3847 RenderViewHostImpl* render_view_host,
3843 int64 frame_id) { 3848 int64 frame_id) {
3844 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 3849 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
3845 FrameDetached(render_view_host, frame_id)); 3850 FrameDetached(render_view_host, frame_id));
3846 } 3851 }
3847 3852
3848 } // namespace content 3853 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698