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

Unified Diff: ui/gfx/native_widget_types.h

Issue 2348143003: MacViews: Implement Force Touch/Mac dictionary lookup for Textfields. (Closed)
Patch Set: --- Created 4 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
« no previous file with comments | « ui/gfx/BUILD.gn ('k') | ui/gfx/render_text.h » ('j') | ui/gfx/render_text.h » ('J')
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 4f814c2ecadca305a569b7986ff72ee931df6838..43f8a387dd54f127d70b6e4dde69523af02b5be9 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include "base/logging.h"
+#include "base/strings/string16.h"
#include "build/build_config.h"
#if defined(OS_ANDROID)
@@ -80,6 +81,7 @@ struct CGContext;
@class NSView;
@class NSWindow;
@class NSTextField;
+@class NSMutableAttributedString;
#else
class NSCursor;
class NSEvent;
@@ -88,6 +90,7 @@ class NSImage;
struct NSView;
class NSWindow;
class NSTextField;
+class NSMutableAttributedString;
#endif // __OBJC__
#elif defined(OS_POSIX)
typedef struct _cairo cairo_t;
@@ -215,6 +218,12 @@ const AcceleratedWidget kNullAcceleratedWidget = 0;
#error unknown platform
#endif
+#if defined(OS_MACOSX)
+typedef NSMutableAttributedString* NativeStyledString;
+#else
+typedef base::string16* NativeStyledString;
+#endif
+
} // namespace gfx
#endif // UI_GFX_NATIVE_WIDGET_TYPES_H_
« no previous file with comments | « ui/gfx/BUILD.gn ('k') | ui/gfx/render_text.h » ('j') | ui/gfx/render_text.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698