ui/gfx/native_widget_types.h - Issue 10696173: Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."

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: ui/gfx/native_widget_types.h

Issue 10696173: Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase number deux Created 8 years, 5 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

Index: ui/gfx/native_widget_types.h

diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h

index d9eeebc5491c61fca102e72a437472c9d3b77920..6fc848deadad5ec7a29d26a4df347ecdad40b1de 100644

--- a/ui/gfx/native_widget_types.h

+++ b/ui/gfx/native_widget_types.h

@@ -89,7 +89,7 @@ typedef struct _GtkWidget GtkWidget;

typedef struct _GtkWindow GtkWindow;

#elif defined(OS_ANDROID)

namespace content {

-class ContentView;

+class ContentViewCore;

}

#endif

class SkBitmap;

@@ -121,8 +121,8 @@ typedef GdkRegion* NativeRegion;

typedef GdkEvent* NativeEvent;

#elif defined(OS_ANDROID)

typedef void* NativeCursor;

-typedef content::ContentView* NativeView;

-typedef content::ContentView* NativeWindow;

+typedef content::ContentViewCore* NativeView;

+typedef content::ContentViewCore* NativeWindow;

typedef void* NativeRegion;

typedef jobject NativeEvent;

#endif

« no previous file with comments | « content/public/browser/android/content_view_core.h ('k') | no next file » | no next file with comments »