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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 868123002: Reset gesture detection upon page navigation for Aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename the method Created 5 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
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/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 2609 matching lines...) Expand 10 before | Expand all | Expand 10 after
2620 window_->GetHost(), 2620 window_->GetHost(),
2621 desired_size, 2621 desired_size,
2622 defer_compositor_lock, 2622 defer_compositor_lock,
2623 base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs))); 2623 base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs)));
2624 } 2624 }
2625 2625
2626 DelegatedFrameHost* RenderWidgetHostViewAura::GetDelegatedFrameHost() const { 2626 DelegatedFrameHost* RenderWidgetHostViewAura::GetDelegatedFrameHost() const {
2627 return delegated_frame_host_.get(); 2627 return delegated_frame_host_.get();
2628 } 2628 }
2629 2629
2630 void RenderWidgetHostViewAura::OnMainFrameNavigation() {
2631 ui::GestureRecognizer::Get()->CancelActiveTouches(window_);
2632 }
2633
2630 //////////////////////////////////////////////////////////////////////////////// 2634 ////////////////////////////////////////////////////////////////////////////////
2631 // RenderWidgetHostViewBase, public: 2635 // RenderWidgetHostViewBase, public:
2632 2636
2633 // static 2637 // static
2634 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2638 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2635 GetScreenInfoForWindow(results, NULL); 2639 GetScreenInfoForWindow(results, NULL);
2636 } 2640 }
2637 2641
2642
2643
2638 } // namespace content 2644 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698