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

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

Issue 2095813002: Revert of Routing IME Result Calls to the Correct RenderWidgetHost (Aura Only) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.cc » ('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_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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 // Exposed for tests. 345 // Exposed for tests.
346 aura::Window* window() { return window_; } 346 aura::Window* window() { return window_; }
347 347
348 DelegatedFrameHost* GetDelegatedFrameHost() const { 348 DelegatedFrameHost* GetDelegatedFrameHost() const {
349 return delegated_frame_host_.get(); 349 return delegated_frame_host_.get();
350 } 350 }
351 351
352 const ui::MotionEventAura& pointer_state() const { return pointer_state_; } 352 const ui::MotionEventAura& pointer_state() const { return pointer_state_; }
353 353
354 private: 354 private:
355 friend class InputMethodResultAuraTest;
356 friend class RenderWidgetHostViewAuraCopyRequestTest; 355 friend class RenderWidgetHostViewAuraCopyRequestTest;
357 friend class TestInputMethodObserver; 356 friend class TestInputMethodObserver;
358 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, 357 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
359 PopupRetainsCaptureAfterMouseRelease); 358 PopupRetainsCaptureAfterMouseRelease);
360 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); 359 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText);
361 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); 360 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState);
362 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, 361 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
363 TouchEventPositionsArentRounded); 362 TouchEventPositionsArentRounded);
364 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); 363 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync);
365 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, Resize); 364 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, Resize);
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 bool disable_input_event_router_for_testing_; 693 bool disable_input_event_router_for_testing_;
695 694
696 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 695 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
697 696
698 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 697 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
699 }; 698 };
700 699
701 } // namespace content 700 } // namespace content
702 701
703 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 702 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698