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

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

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reverted changes for MockInputMethod. Created 5 years, 6 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_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 gfx::NativeViewAccessible accessible_parent) override; 233 gfx::NativeViewAccessible accessible_parent) override;
234 gfx::NativeViewId GetParentForWindowlessPlugin() const override; 234 gfx::NativeViewId GetParentForWindowlessPlugin() const override;
235 #endif 235 #endif
236 236
237 // Overridden from ui::TextInputClient: 237 // Overridden from ui::TextInputClient:
238 void SetCompositionText(const ui::CompositionText& composition) override; 238 void SetCompositionText(const ui::CompositionText& composition) override;
239 void ConfirmCompositionText() override; 239 void ConfirmCompositionText() override;
240 void ClearCompositionText() override; 240 void ClearCompositionText() override;
241 void InsertText(const base::string16& text) override; 241 void InsertText(const base::string16& text) override;
242 void InsertChar(base::char16 ch, int flags) override; 242 void InsertChar(base::char16 ch, int flags) override;
243 gfx::NativeWindow GetAttachedWindow() const override;
244 ui::TextInputType GetTextInputType() const override; 243 ui::TextInputType GetTextInputType() const override;
245 ui::TextInputMode GetTextInputMode() const override; 244 ui::TextInputMode GetTextInputMode() const override;
246 int GetTextInputFlags() const override; 245 int GetTextInputFlags() const override;
247 bool CanComposeInline() const override; 246 bool CanComposeInline() const override;
248 gfx::Rect GetCaretBounds() const override; 247 gfx::Rect GetCaretBounds() const override;
249 bool GetCompositionCharacterBounds(uint32 index, 248 bool GetCompositionCharacterBounds(uint32 index,
250 gfx::Rect* rect) const override; 249 gfx::Rect* rect) const override;
251 bool HasCompositionText() const override; 250 bool HasCompositionText() const override;
252 bool GetTextRange(gfx::Range* range) const override; 251 bool GetTextRange(gfx::Range* range) const override;
253 bool GetCompositionTextRange(gfx::Range* range) const override; 252 bool GetCompositionTextRange(gfx::Range* range) const override;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 345
347 void SnapToPhysicalPixelBoundary(); 346 void SnapToPhysicalPixelBoundary();
348 347
349 OverscrollController* overscroll_controller() const { 348 OverscrollController* overscroll_controller() const {
350 return overscroll_controller_.get(); 349 return overscroll_controller_.get();
351 } 350 }
352 351
353 // Called when the context menu is about to be displayed. 352 // Called when the context menu is about to be displayed.
354 void OnShowContextMenu(); 353 void OnShowContextMenu();
355 354
355 // Exposed for tests.
356 aura::Window* window() { return window_; }
357
356 protected: 358 protected:
357 ~RenderWidgetHostViewAura() override; 359 ~RenderWidgetHostViewAura() override;
358 360
359 // Exposed for tests.
360 aura::Window* window() { return window_; }
361
362 DelegatedFrameHost* GetDelegatedFrameHost() const { 361 DelegatedFrameHost* GetDelegatedFrameHost() const {
363 return delegated_frame_host_.get(); 362 return delegated_frame_host_.get();
364 } 363 }
365 const ui::MotionEventAura& pointer_state() const { return pointer_state_; } 364 const ui::MotionEventAura& pointer_state() const { return pointer_state_; }
366 365
367 private: 366 private:
368 friend class RenderWidgetHostViewAuraCopyRequestTest; 367 friend class RenderWidgetHostViewAuraCopyRequestTest;
369 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, 368 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
370 PopupRetainsCaptureAfterMouseRelease); 369 PopupRetainsCaptureAfterMouseRelease);
371 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); 370 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText);
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 674
676 BeginFrameObserverProxy begin_frame_observer_proxy_; 675 BeginFrameObserverProxy begin_frame_observer_proxy_;
677 676
678 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 677 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
679 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 678 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
680 }; 679 };
681 680
682 } // namespace content 681 } // namespace content
683 682
684 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 683 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698