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

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

Issue 246773008: RWHI should implement BrowserAccessibilityDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error Created 6 years, 7 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 | Annotate | Revision Log
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>
11 #include <string> 11 #include <string>
12 #include <utility> 12 #include <utility>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/mac/scoped_nsobject.h" 15 #include "base/mac/scoped_nsobject.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "content/browser/accessibility/browser_accessibility_delegate_mac.h"
20 #include "content/browser/renderer_host/display_link_mac.h" 19 #include "content/browser/renderer_host/display_link_mac.h"
21 #include "content/browser/renderer_host/render_widget_host_view_base.h" 20 #include "content/browser/renderer_host/render_widget_host_view_base.h"
22 #include "content/browser/renderer_host/software_frame_manager.h" 21 #include "content/browser/renderer_host/software_frame_manager.h"
23 #include "content/common/cursors/webcursor.h" 22 #include "content/common/cursors/webcursor.h"
24 #include "content/common/edit_command.h" 23 #include "content/common/edit_command.h"
25 #import "content/public/browser/render_widget_host_view_mac_base.h" 24 #import "content/public/browser/render_widget_host_view_mac_base.h"
26 #include "ipc/ipc_sender.h" 25 #include "ipc/ipc_sender.h"
27 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" 26 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
28 #include "ui/base/cocoa/base_view.h" 27 #include "ui/base/cocoa/base_view.h"
29 28
(...skipping 14 matching lines...) Expand all
44 - (content::RenderWidgetHostViewMac*)renderWidgetHostViewMac; 43 - (content::RenderWidgetHostViewMac*)renderWidgetHostViewMac;
45 @end 44 @end
46 45
47 // This is the view that lives in the Cocoa view hierarchy. In Windows-land, 46 // This is the view that lives in the Cocoa view hierarchy. In Windows-land,
48 // RenderWidgetHostViewWin is both the view and the delegate. We split the roles 47 // RenderWidgetHostViewWin is both the view and the delegate. We split the roles
49 // but that means that the view needs to own the delegate and will dispose of it 48 // but that means that the view needs to own the delegate and will dispose of it
50 // when it's removed from the view system. 49 // when it's removed from the view system.
51 @interface RenderWidgetHostViewCocoa 50 @interface RenderWidgetHostViewCocoa
52 : BaseView <RenderWidgetHostViewMacBase, 51 : BaseView <RenderWidgetHostViewMacBase,
53 RenderWidgetHostViewMacOwner, 52 RenderWidgetHostViewMacOwner,
54 NSTextInputClient, 53 NSTextInputClient> {
55 BrowserAccessibilityDelegateCocoa> {
56 @private 54 @private
57 scoped_ptr<content::RenderWidgetHostViewMac> renderWidgetHostView_; 55 scoped_ptr<content::RenderWidgetHostViewMac> renderWidgetHostView_;
58 // This ivar is the cocoa delegate of the NSResponder. 56 // This ivar is the cocoa delegate of the NSResponder.
59 base::scoped_nsobject<NSObject<RenderWidgetHostViewMacDelegate>> 57 base::scoped_nsobject<NSObject<RenderWidgetHostViewMacDelegate>>
60 responderDelegate_; 58 responderDelegate_;
61 BOOL canBeKeyView_; 59 BOOL canBeKeyView_;
62 BOOL takesFocusOnlyOnMouseDown_; 60 BOOL takesFocusOnlyOnMouseDown_;
63 BOOL closeOnDeactivate_; 61 BOOL closeOnDeactivate_;
64 scoped_ptr<content::RenderWidgetHostViewMacEditCommandHelper> 62 scoped_ptr<content::RenderWidgetHostViewMacEditCommandHelper>
65 editCommand_helper_; 63 editCommand_helper_;
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 virtual bool CanSubscribeFrame() const OVERRIDE; 301 virtual bool CanSubscribeFrame() const OVERRIDE;
304 virtual void BeginFrameSubscription( 302 virtual void BeginFrameSubscription(
305 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE; 303 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE;
306 virtual void EndFrameSubscription() OVERRIDE; 304 virtual void EndFrameSubscription() OVERRIDE;
307 virtual void OnSwapCompositorFrame( 305 virtual void OnSwapCompositorFrame(
308 uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame) OVERRIDE; 306 uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
309 virtual void OnAcceleratedCompositingStateChange() OVERRIDE; 307 virtual void OnAcceleratedCompositingStateChange() OVERRIDE;
310 virtual void AcceleratedSurfaceInitialized(int host_id, 308 virtual void AcceleratedSurfaceInitialized(int host_id,
311 int route_id) OVERRIDE; 309 int route_id) OVERRIDE;
312 virtual void CreateBrowserAccessibilityManagerIfNeeded() OVERRIDE; 310 virtual void CreateBrowserAccessibilityManagerIfNeeded() OVERRIDE;
311 virtual gfx::Point AccessibilityOriginInScreen(const gfx::Rect& bounds)
312 OVERRIDE;
313 virtual void OnAccessibilitySetFocus(int acc_obj_id) OVERRIDE;
314 virtual void AccessibilityShowMenu(int acc_obj_id) OVERRIDE;
313 virtual bool PostProcessEventForPluginIme( 315 virtual bool PostProcessEventForPluginIme(
314 const NativeWebKeyboardEvent& event) OVERRIDE; 316 const NativeWebKeyboardEvent& event) OVERRIDE;
315 317
316 virtual void AcceleratedSurfaceBuffersSwapped( 318 virtual void AcceleratedSurfaceBuffersSwapped(
317 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, 319 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
318 int gpu_host_id) OVERRIDE; 320 int gpu_host_id) OVERRIDE;
319 virtual void AcceleratedSurfacePostSubBuffer( 321 virtual void AcceleratedSurfacePostSubBuffer(
320 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, 322 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
321 int gpu_host_id) OVERRIDE; 323 int gpu_host_id) OVERRIDE;
322 virtual void AcceleratedSurfaceSuspend() OVERRIDE; 324 virtual void AcceleratedSurfaceSuspend() OVERRIDE;
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; 647 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
646 648
647 base::WeakPtrFactory<RenderWidgetHostViewMac> 649 base::WeakPtrFactory<RenderWidgetHostViewMac>
648 software_frame_weak_ptr_factory_; 650 software_frame_weak_ptr_factory_;
649 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 651 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
650 }; 652 };
651 653
652 } // namespace content 654 } // namespace content
653 655
654 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 656 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698