content/browser/android/content_view_core_impl.cc - Issue 14169011: [Android] Rename NativeWindow to WindowAndroid.

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/android/content_view_core_impl.cc

Issue 14169011: [Android] Rename NativeWindow to WindowAndroid. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Return Activity context for now Created 7 years, 8 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:

Index: content/browser/android/content_view_core_impl.cc

diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc

index bacbec92abf3c27dff105f686194772cfe22a0f5..0fc1f100c8e1fd508c0e10f9aca0e841e67c5e26 100644

--- a/content/browser/android/content_view_core_impl.cc

+++ b/content/browser/android/content_view_core_impl.cc

@@ -45,8 +45,8 @@

#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/android/WebInputEventFactory.h"

+#include "ui/android/window_android.h"

#include "ui/gfx/android/java_bitmap.h"

-#include "ui/gfx/android/window_android.h"

#include "ui/gfx/screen.h"

#include "ui/gfx/size_conversions.h"

#include "ui/gfx/size_f.h"

@@ -683,6 +683,8 @@ void ContentViewCoreImpl::LoadUrl(

}

ui::WindowAndroid* ContentViewCoreImpl::GetWindowAndroid() const {

+ // This should never be NULL for Chrome, but will be NULL for WebView.

+ DCHECK(window_android_);

return window_android_;

}