content/browser/web_contents/aura/overscroll_navigation_overlay.cc - Issue 698253004: Reland: Implement Aura side of unified touch text selection for contents

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/aura/overscroll_navigation_overlay.cc

Issue 698253004: Reland: Implement Aura side of unified touch text selection for contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed overrides in TouchHandleDrawableAura Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/web_contents/aura/overscroll_navigation_overlay.h ('k') | content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc » ('j') | ui/touch_selection/touch_handle.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/aura/overscroll_navigation_overlay.cc

diff --git a/content/browser/web_contents/aura/overscroll_navigation_overlay.cc b/content/browser/web_contents/aura/overscroll_navigation_overlay.cc

index e2d82b7f5e3fda11777fc94b1512e80eb54734e0..3409877388af4692c6644a4b26c3c99fd62af99d 100644

--- a/content/browser/web_contents/aura/overscroll_navigation_overlay.cc

+++ b/content/browser/web_contents/aura/overscroll_navigation_overlay.cc

@@ -6,11 +6,11 @@

#include "content/browser/frame_host/navigation_entry_impl.h"

#include "content/browser/renderer_host/render_view_host_impl.h"

-#include "content/browser/web_contents/aura/image_window_delegate.h"

#include "content/browser/web_contents/web_contents_impl.h"

#include "content/common/view_messages.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/render_widget_host_view.h"

+#include "ui/aura/image_window_delegate.h"

#include "ui/aura/window.h"

#include "ui/base/layout.h"

#include "ui/compositor/layer.h"

@@ -162,7 +162,7 @@ void OverscrollNavigationOverlay::StartObserving() {

void OverscrollNavigationOverlay::SetOverlayWindow(

scoped_ptr<aura::Window> window,

- ImageWindowDelegate* delegate) {

+ aura::ImageWindowDelegate* delegate) {

window_ = window.Pass();

if (window_.get() && window_->parent())

window_->parent()->StackChildAtTop(window_.get());