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

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

Issue 2842383002: Fix a recent regression in Speech->Start Speaking on Mac (Closed)
Patch Set: Created 3 years, 8 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 <IOSurface/IOSurface.h> 9 #include <IOSurface/IOSurface.h>
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 // The last scroll offset of the view. 523 // The last scroll offset of the view.
524 gfx::Vector2dF last_scroll_offset_; 524 gfx::Vector2dF last_scroll_offset_;
525 525
526 // The text to be shown in the tooltip, supplied by the renderer. 526 // The text to be shown in the tooltip, supplied by the renderer.
527 base::string16 tooltip_text_; 527 base::string16 tooltip_text_;
528 528
529 // True when this view acts as a platform view hack for a 529 // True when this view acts as a platform view hack for a
530 // RenderWidgetHostViewGuest. 530 // RenderWidgetHostViewGuest.
531 bool is_guest_view_hack_; 531 bool is_guest_view_hack_;
532 532
533 // selected text on the renderer.
534 std::string selected_text_;
535
536 // The window used for popup widgets. 533 // The window used for popup widgets.
537 base::scoped_nsobject<NSWindow> popup_window_; 534 base::scoped_nsobject<NSWindow> popup_window_;
538 535
539 // The fullscreen window used for pepper flash. 536 // The fullscreen window used for pepper flash.
540 base::scoped_nsobject<NSWindow> pepper_fullscreen_window_; 537 base::scoped_nsobject<NSWindow> pepper_fullscreen_window_;
541 base::scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_; 538 base::scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
542 // Our parent host view, if this is fullscreen. NULL otherwise. 539 // Our parent host view, if this is fullscreen. NULL otherwise.
543 RenderWidgetHostViewMac* fullscreen_parent_host_view_; 540 RenderWidgetHostViewMac* fullscreen_parent_host_view_;
544 541
545 // Display link for getting vsync info. 542 // Display link for getting vsync info.
(...skipping 15 matching lines...) Expand all
561 558
562 // Factory used to safely scope delayed calls to ShutdownHost(). 559 // Factory used to safely scope delayed calls to ShutdownHost().
563 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; 560 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
564 561
565 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 562 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
566 }; 563 };
567 564
568 } // namespace content 565 } // namespace content
569 566
570 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 567 #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