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

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

Issue 1255783002: [Mac] Factor out keyboard shortcut handling from ChromeEventProcessingWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@execute
Patch Set: UI_BASE_EXPORT CommandDispatcher Created 5 years, 3 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
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 <list> 10 #include <list>
11 #include <map> 11 #include <map>
12 #include <set> 12 #include <set>
13 #include <string> 13 #include <string>
14 #include <utility> 14 #include <utility>
15 #include <vector> 15 #include <vector>
16 16
17 #include "base/mac/scoped_nsobject.h" 17 #include "base/mac/scoped_nsobject.h"
18 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
19 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
20 #include "base/time/time.h" 20 #include "base/time/time.h"
21 #include "content/browser/compositor/browser_compositor_view_mac.h" 21 #include "content/browser/compositor/browser_compositor_view_mac.h"
22 #include "content/browser/compositor/delegated_frame_host.h" 22 #include "content/browser/compositor/delegated_frame_host.h"
23 #include "content/browser/renderer_host/input/mouse_wheel_rails_filter_mac.h" 23 #include "content/browser/renderer_host/input/mouse_wheel_rails_filter_mac.h"
24 #include "content/browser/renderer_host/render_widget_host_view_base.h" 24 #include "content/browser/renderer_host/render_widget_host_view_base.h"
25 #include "content/common/content_export.h" 25 #include "content/common/content_export.h"
26 #include "content/common/cursors/webcursor.h" 26 #include "content/common/cursors/webcursor.h"
27 #include "content/common/edit_command.h" 27 #include "content/common/edit_command.h"
28 #import "content/public/browser/render_widget_host_view_mac_base.h"
29 #include "ipc/ipc_sender.h" 28 #include "ipc/ipc_sender.h"
30 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" 29 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
31 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h" 30 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
32 #include "ui/accelerated_widget_mac/display_link_mac.h" 31 #include "ui/accelerated_widget_mac/display_link_mac.h"
33 #include "ui/accelerated_widget_mac/io_surface_layer.h" 32 #include "ui/accelerated_widget_mac/io_surface_layer.h"
33 #import "ui/base/cocoa/command_dispatcher.h"
34 #include "ui/base/cocoa/remote_layer_api.h" 34 #include "ui/base/cocoa/remote_layer_api.h"
35 #import "ui/base/cocoa/tool_tip_base_view.h" 35 #import "ui/base/cocoa/tool_tip_base_view.h"
36 #include "ui/gfx/display_observer.h" 36 #include "ui/gfx/display_observer.h"
37 37
38 struct ViewHostMsg_TextInputState_Params; 38 struct ViewHostMsg_TextInputState_Params;
39 39
40 namespace content { 40 namespace content {
41 class RenderWidgetHostImpl; 41 class RenderWidgetHostImpl;
42 class RenderWidgetHostViewMac; 42 class RenderWidgetHostViewMac;
43 class RenderWidgetHostViewMacEditCommandHelper; 43 class RenderWidgetHostViewMacEditCommandHelper;
(...skipping 10 matching lines...) Expand all
54 54
55 @protocol RenderWidgetHostViewMacOwner 55 @protocol RenderWidgetHostViewMacOwner
56 - (content::RenderWidgetHostViewMac*)renderWidgetHostViewMac; 56 - (content::RenderWidgetHostViewMac*)renderWidgetHostViewMac;
57 @end 57 @end
58 58
59 // This is the view that lives in the Cocoa view hierarchy. In Windows-land, 59 // This is the view that lives in the Cocoa view hierarchy. In Windows-land,
60 // RenderWidgetHostViewWin is both the view and the delegate. We split the roles 60 // RenderWidgetHostViewWin is both the view and the delegate. We split the roles
61 // but that means that the view needs to own the delegate and will dispose of it 61 // but that means that the view needs to own the delegate and will dispose of it
62 // when it's removed from the view system. 62 // when it's removed from the view system.
63 @interface RenderWidgetHostViewCocoa 63 @interface RenderWidgetHostViewCocoa
64 : ToolTipBaseView<RenderWidgetHostViewMacBase, 64 : ToolTipBaseView<CommandDispatcherTarget,
65 RenderWidgetHostViewMacOwner, 65 RenderWidgetHostViewMacOwner,
66 NSTextInputClient> { 66 NSTextInputClient> {
67 @private 67 @private
68 scoped_ptr<content::RenderWidgetHostViewMac> renderWidgetHostView_; 68 scoped_ptr<content::RenderWidgetHostViewMac> renderWidgetHostView_;
69 // This ivar is the cocoa delegate of the NSResponder. 69 // This ivar is the cocoa delegate of the NSResponder.
70 base::scoped_nsobject<NSObject<RenderWidgetHostViewMacDelegate>> 70 base::scoped_nsobject<NSObject<RenderWidgetHostViewMacDelegate>>
71 responderDelegate_; 71 responderDelegate_;
72 BOOL canBeKeyView_; 72 BOOL canBeKeyView_;
73 BOOL closeOnDeactivate_; 73 BOOL closeOnDeactivate_;
74 BOOL opaque_; 74 BOOL opaque_;
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 589
590 // Factory used to safely scope delayed calls to ShutdownHost(). 590 // Factory used to safely scope delayed calls to ShutdownHost().
591 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; 591 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
592 592
593 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 593 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
594 }; 594 };
595 595
596 } // namespace content 596 } // namespace content
597 597
598 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 598 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | content/public/browser/render_widget_host_view_mac_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698