diff options
| author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 17:50:18 +0000 |
|---|---|---|
| committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 17:50:18 +0000 |
| commit | e9fbb9350248394b584934cb735b5506e4f164d6 (patch) | |
| tree | 7b0cb8669e8305a179333379a114928815dd421f /ui | |
| parent | 583eb026cd10f3e42db09893ea24c43c80ced8ac (diff) | |
| download | chromium_src-e9fbb9350248394b584934cb735b5506e4f164d6.zip chromium_src-e9fbb9350248394b584934cb735b5506e4f164d6.tar.gz chromium_src-e9fbb9350248394b584934cb735b5506e4f164d6.tar.bz2 | |
Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."
This reverts commit 331b803f65e8f994f9148024e8c2be6b465c6a6e.
TBR=ericu@chromium.org
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10696173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/native_widget_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h index d9eeebc..6fc848d 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 |