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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 11498008: RenderWidget popup should be a NSWindow so it can go outside the main window. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed nits Created 7 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 470
471 // The text to be shown in the tooltip, supplied by the renderer. 471 // The text to be shown in the tooltip, supplied by the renderer.
472 string16 tooltip_text_; 472 string16 tooltip_text_;
473 473
474 // Factory used to safely scope delayed calls to ShutdownHost(). 474 // Factory used to safely scope delayed calls to ShutdownHost().
475 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; 475 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
476 476
477 // selected text on the renderer. 477 // selected text on the renderer.
478 std::string selected_text_; 478 std::string selected_text_;
479 479
480 // The window used for popup widgets.
481 scoped_nsobject<NSWindow> popup_window_;
482
480 // The fullscreen window used for pepper flash. 483 // The fullscreen window used for pepper flash.
481 scoped_nsobject<NSWindow> pepper_fullscreen_window_; 484 scoped_nsobject<NSWindow> pepper_fullscreen_window_;
482 scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_; 485 scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
483 // Our parent host view, if this is fullscreen. NULL otherwise. 486 // Our parent host view, if this is fullscreen. NULL otherwise.
484 RenderWidgetHostViewMac* fullscreen_parent_host_view_; 487 RenderWidgetHostViewMac* fullscreen_parent_host_view_;
485 488
486 // List of pending swaps for deferred acking: 489 // List of pending swaps for deferred acking:
487 // pairs of (route_id, gpu_host_id). 490 // pairs of (route_id, gpu_host_id).
488 std::list<std::pair<int32, int32> > pending_swap_buffers_acks_; 491 std::list<std::pair<int32, int32> > pending_swap_buffers_acks_;
489 492
490 // The current composition character range and its bounds. 493 // The current composition character range and its bounds.
491 ui::Range composition_range_; 494 ui::Range composition_range_;
492 std::vector<gfx::Rect> composition_bounds_; 495 std::vector<gfx::Rect> composition_bounds_;
493 496
494 // The current caret bounds. 497 // The current caret bounds.
495 gfx::Rect caret_rect_; 498 gfx::Rect caret_rect_;
496 499
497 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 500 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
498 }; 501 };
499 502
500 } // namespace content 503 } // namespace content
501 504
502 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 505 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698