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

Unified Diff: ui/gfx/native_widget_types.h

Issue 138423003: Change PluginWindowHandle type to be bool on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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/child/plugin_messages.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/native_widget_types.h
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
index d6c3fcb387e51b3c818cf6ad549defa54af77aae..fd068c55ba84977a67447ecf3543382a6138ab79 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -233,7 +233,7 @@ static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) {
#endif // defined(OS_POSIX)
// PluginWindowHandle is an abstraction wrapping "the types of windows
-// used by NPAPI plugins". On Windows it's an HWND, on X it's an X
+// used by NPAPI plugins". On Windows it's an HWND, on X it's an X
// window id.
#if defined(OS_WIN)
typedef HWND PluginWindowHandle;
@@ -241,11 +241,6 @@ static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) {
#elif defined(USE_X11)
typedef unsigned long PluginWindowHandle;
const PluginWindowHandle kNullPluginWindow = 0;
-#elif defined(USE_AURA) && defined(OS_MACOSX)
- // Mac-Aura uses NSView-backed GLSurface. Regular Mac does not.
- // TODO(dhollowa): Rationalize these two definitions. http://crbug.com/104551.
- typedef NSView* PluginWindowHandle;
- const PluginWindowHandle kNullPluginWindow = 0;
#elif defined(OS_ANDROID)
typedef uint64 PluginWindowHandle;
const PluginWindowHandle kNullPluginWindow = 0;
@@ -253,17 +248,9 @@ static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) {
typedef intptr_t PluginWindowHandle;
const PluginWindowHandle kNullPluginWindow = 0;
#else
- // On OS X we don't have windowed plugins.
- // We use a NULL/0 PluginWindowHandle in shared code to indicate there
- // is no window present, so mirror that behavior here.
- //
- // The GPU plugin is currently an exception to this rule. As of this
- // writing it uses some NPAPI infrastructure, and minimally we need
- // to identify the plugin instance via this window handle. When the
- // GPU plugin becomes a full-on GPU process, this typedef can be
- // returned to a bool. For now we use a type large enough to hold a
- // pointer on 64-bit architectures in case we need this capability.
- typedef uint64 PluginWindowHandle;
+ // On Mac we don't have windowed plugins. We use a NULL/0 PluginWindowHandle
+ // in shared code to indicate there is no window present.
+ typedef bool PluginWindowHandle;
const PluginWindowHandle kNullPluginWindow = 0;
#endif
« no previous file with comments | « content/child/plugin_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698