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

Unified Diff: ui/gfx/native_widget_types.h

Issue 10916160: Upstreaming SelectFileDialog for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Elliot's nits Created 8 years, 3 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 3858c11e134b6fefea0407280e20e7b943cd7a28..32c1abbb624aeeacabd42d7b6274e497bafcd435 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -111,6 +111,7 @@ namespace content {
class ContentViewCore;
}
#endif
+class WindowAndroid;
Yaron 2012/09/12 19:14:45 This should be in the #ifdef above. Also I think y
aurimas (slooooooooow) 2012/09/13 15:37:15 Done.
class SkBitmap;
namespace gfx {
@@ -146,7 +147,7 @@ typedef GdkEvent* NativeEvent;
#elif defined(OS_ANDROID)
typedef void* NativeCursor;
typedef content::ContentViewCore* NativeView;
Yaron 2012/09/12 19:14:45 Should this not also be WindowAndroid?
aurimas (slooooooooow) 2012/09/13 15:37:15 I talked to dtrainor and he said not at this point
-typedef content::ContentViewCore* NativeWindow;
+typedef WindowAndroid* NativeWindow;
typedef void* NativeRegion;
typedef jobject NativeEvent;
#endif

Powered by Google App Engine
This is Rietveld 408576698