| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
| 7 | 7 |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 #include <IOSurface/IOSurface.h> | 9 #include <IOSurface/IOSurface.h> |
| 10 #include <stddef.h> | 10 #include <stddef.h> |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 | 123 |
| 124 // Marked text which was generated by handling a key down event. | 124 // Marked text which was generated by handling a key down event. |
| 125 base::string16 markedText_; | 125 base::string16 markedText_; |
| 126 | 126 |
| 127 // Selected range of |markedText_|. | 127 // Selected range of |markedText_|. |
| 128 NSRange markedTextSelectedRange_; | 128 NSRange markedTextSelectedRange_; |
| 129 | 129 |
| 130 // Underline information of the |markedText_|. | 130 // Underline information of the |markedText_|. |
| 131 std::vector<blink::WebCompositionUnderline> underlines_; | 131 std::vector<blink::WebCompositionUnderline> underlines_; |
| 132 | 132 |
| 133 // Replacement range information received from |setMarkedText:|. |
| 134 gfx::Range setMarkedTextReplacementRange_; |
| 135 |
| 133 // Indicates if doCommandBySelector method receives any edit command when | 136 // Indicates if doCommandBySelector method receives any edit command when |
| 134 // handling a key down event. | 137 // handling a key down event. |
| 135 BOOL hasEditCommands_; | 138 BOOL hasEditCommands_; |
| 136 | 139 |
| 137 // Contains edit commands received by the -doCommandBySelector: method when | 140 // Contains edit commands received by the -doCommandBySelector: method when |
| 138 // handling a key down event, not including inserting commands, eg. insertTab, | 141 // handling a key down event, not including inserting commands, eg. insertTab, |
| 139 // etc. | 142 // etc. |
| 140 content::EditCommands editCommands_; | 143 content::EditCommands editCommands_; |
| 141 | 144 |
| 142 // The plugin that currently has focus (-1 if no plugin has focus). | 145 // The plugin that currently has focus (-1 if no plugin has focus). |
| (...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 609 | 612 |
| 610 // Factory used to safely scope delayed calls to ShutdownHost(). | 613 // Factory used to safely scope delayed calls to ShutdownHost(). |
| 611 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; | 614 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; |
| 612 | 615 |
| 613 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); | 616 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); |
| 614 }; | 617 }; |
| 615 | 618 |
| 616 } // namespace content | 619 } // namespace content |
| 617 | 620 |
| 618 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 621 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
| OLD | NEW |