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

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 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 event.wheelTicksY && 1241 event.wheelTicksY &&
1242 (event.modifiers & blink::WebInputEvent::ControlKey)) { 1242 (event.modifiers & blink::WebInputEvent::ControlKey)) {
1243 delegate_->ContentsZoomChange(event.wheelTicksY > 0); 1243 delegate_->ContentsZoomChange(event.wheelTicksY > 0);
1244 return true; 1244 return true;
1245 } 1245 }
1246 #endif 1246 #endif
1247 1247
1248 return false; 1248 return false;
1249 } 1249 }
1250 1250
1251 bool WebContentsImpl::PreHandleGestureEvent(
1252 const blink::WebGestureEvent& event) {
1253 return delegate_->PreHandleGestureEvent(this, event);
1254 }
1255
1251 #if defined(OS_WIN) && defined(USE_AURA) 1256 #if defined(OS_WIN) && defined(USE_AURA)
1252 gfx::NativeViewAccessible WebContentsImpl::GetParentNativeViewAccessible() { 1257 gfx::NativeViewAccessible WebContentsImpl::GetParentNativeViewAccessible() {
1253 return accessible_parent_; 1258 return accessible_parent_;
1254 } 1259 }
1255 #endif 1260 #endif
1256 1261
1257 void WebContentsImpl::HandleMouseDown() { 1262 void WebContentsImpl::HandleMouseDown() {
1258 if (delegate_) 1263 if (delegate_)
1259 delegate_->HandleMouseDown(); 1264 delegate_->HandleMouseDown();
1260 } 1265 }
(...skipping 2609 matching lines...) Expand 10 before | Expand all | Expand 10 after
3870 } 3875 }
3871 3876
3872 void WebContentsImpl::OnFrameRemoved( 3877 void WebContentsImpl::OnFrameRemoved(
3873 RenderViewHostImpl* render_view_host, 3878 RenderViewHostImpl* render_view_host,
3874 int64 frame_id) { 3879 int64 frame_id) {
3875 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 3880 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
3876 FrameDetached(render_view_host, frame_id)); 3881 FrameDetached(render_view_host, frame_id));
3877 } 3882 }
3878 3883
3879 } // namespace content 3884 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698