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

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

Issue 1914603002: Replace ViewHostMsg_TextInputState_Params with content::TextInputState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing Comments Created 4 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
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 22 matching lines...) Expand all
33 #include "content/common/edit_command.h" 33 #include "content/common/edit_command.h"
34 #include "ipc/ipc_sender.h" 34 #include "ipc/ipc_sender.h"
35 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" 35 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
36 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h" 36 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
37 #include "ui/accelerated_widget_mac/display_link_mac.h" 37 #include "ui/accelerated_widget_mac/display_link_mac.h"
38 #import "ui/base/cocoa/command_dispatcher.h" 38 #import "ui/base/cocoa/command_dispatcher.h"
39 #include "ui/base/cocoa/remote_layer_api.h" 39 #include "ui/base/cocoa/remote_layer_api.h"
40 #import "ui/base/cocoa/tool_tip_base_view.h" 40 #import "ui/base/cocoa/tool_tip_base_view.h"
41 #include "ui/gfx/display_observer.h" 41 #include "ui/gfx/display_observer.h"
42 42
43 struct ViewHostMsg_TextInputState_Params;
44
45 namespace content { 43 namespace content {
46 class RenderWidgetHostImpl; 44 class RenderWidgetHostImpl;
47 class RenderWidgetHostViewMac; 45 class RenderWidgetHostViewMac;
48 class RenderWidgetHostViewMacEditCommandHelper; 46 class RenderWidgetHostViewMacEditCommandHelper;
49 class WebContents; 47 class WebContents;
48 struct TextInputState;
50 } 49 }
51 50
52 namespace ui { 51 namespace ui {
53 class Compositor; 52 class Compositor;
54 class Layer; 53 class Layer;
55 } 54 }
56 55
57 @class FullscreenWindowManager; 56 @class FullscreenWindowManager;
58 @protocol RenderWidgetHostViewMacDelegate; 57 @protocol RenderWidgetHostViewMacDelegate;
59 58
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 void StopSpeaking() override; 279 void StopSpeaking() override;
281 void SetBackgroundColor(SkColor color) override; 280 void SetBackgroundColor(SkColor color) override;
282 281
283 // Implementation of RenderWidgetHostViewBase. 282 // Implementation of RenderWidgetHostViewBase.
284 void InitAsPopup(RenderWidgetHostView* parent_host_view, 283 void InitAsPopup(RenderWidgetHostView* parent_host_view,
285 const gfx::Rect& pos) override; 284 const gfx::Rect& pos) override;
286 void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override; 285 void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override;
287 void Focus() override; 286 void Focus() override;
288 void UpdateCursor(const WebCursor& cursor) override; 287 void UpdateCursor(const WebCursor& cursor) override;
289 void SetIsLoading(bool is_loading) override; 288 void SetIsLoading(bool is_loading) override;
290 void TextInputStateChanged( 289 void TextInputStateChanged(const TextInputState& params) override;
291 const ViewHostMsg_TextInputState_Params& params) override;
292 void ImeCancelComposition() override; 290 void ImeCancelComposition() override;
293 void ImeCompositionRangeChanged( 291 void ImeCompositionRangeChanged(
294 const gfx::Range& range, 292 const gfx::Range& range,
295 const std::vector<gfx::Rect>& character_bounds) override; 293 const std::vector<gfx::Rect>& character_bounds) override;
296 void RenderProcessGone(base::TerminationStatus status, 294 void RenderProcessGone(base::TerminationStatus status,
297 int error_code) override; 295 int error_code) override;
298 void Destroy() override; 296 void Destroy() override;
299 void SetTooltipText(const base::string16& tooltip_text) override; 297 void SetTooltipText(const base::string16& tooltip_text) override;
300 void SelectionChanged(const base::string16& text, 298 void SelectionChanged(const base::string16& text,
301 size_t offset, 299 size_t offset,
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 616
619 // Factory used to safely scope delayed calls to ShutdownHost(). 617 // Factory used to safely scope delayed calls to ShutdownHost().
620 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; 618 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
621 619
622 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 620 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
623 }; 621 };
624 622
625 } // namespace content 623 } // namespace content
626 624
627 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 625 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698