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 <list> | 9 #include <list> |
10 #include <map> | 10 #include <map> |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
469 | 469 |
470 // The text to be shown in the tooltip, supplied by the renderer. | 470 // The text to be shown in the tooltip, supplied by the renderer. |
471 string16 tooltip_text_; | 471 string16 tooltip_text_; |
472 | 472 |
473 // Factory used to safely scope delayed calls to ShutdownHost(). | 473 // Factory used to safely scope delayed calls to ShutdownHost(). |
474 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; | 474 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; |
475 | 475 |
476 // selected text on the renderer. | 476 // selected text on the renderer. |
477 std::string selected_text_; | 477 std::string selected_text_; |
478 | 478 |
| 479 // The window used for popup widgets. |
| 480 scoped_nsobject<NSWindow> popup_window_; |
| 481 |
479 // The fullscreen window used for pepper flash. | 482 // The fullscreen window used for pepper flash. |
480 scoped_nsobject<NSWindow> pepper_fullscreen_window_; | 483 scoped_nsobject<NSWindow> pepper_fullscreen_window_; |
481 scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_; | 484 scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_; |
482 // Our parent host view, if this is fullscreen. NULL otherwise. | 485 // Our parent host view, if this is fullscreen. NULL otherwise. |
483 RenderWidgetHostViewMac* fullscreen_parent_host_view_; | 486 RenderWidgetHostViewMac* fullscreen_parent_host_view_; |
484 | 487 |
485 // List of pending swaps for deferred acking: | 488 // List of pending swaps for deferred acking: |
486 // pairs of (route_id, gpu_host_id). | 489 // pairs of (route_id, gpu_host_id). |
487 std::list<std::pair<int32, int32> > pending_swap_buffers_acks_; | 490 std::list<std::pair<int32, int32> > pending_swap_buffers_acks_; |
488 | 491 |
489 // The current composition character range and its bounds. | 492 // The current composition character range and its bounds. |
490 ui::Range composition_range_; | 493 ui::Range composition_range_; |
491 std::vector<gfx::Rect> composition_bounds_; | 494 std::vector<gfx::Rect> composition_bounds_; |
492 | 495 |
493 // The current caret bounds. | 496 // The current caret bounds. |
494 gfx::Rect caret_rect_; | 497 gfx::Rect caret_rect_; |
495 | 498 |
496 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); | 499 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); |
497 }; | 500 }; |
498 | 501 |
499 } // namespace content | 502 } // namespace content |
500 | 503 |
501 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 504 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
OLD | NEW |