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

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

Issue 2453953003: Moves TransientWindowClient to ui/aura/client and adds observer (Closed)
Patch Set: merge Created 4 years, 1 month 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 | « ash/test/ash_test_helper.cc ('k') | content/shell/browser/shell.h » ('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 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "content/public/common/child_process_host.h" 56 #include "content/public/common/child_process_host.h"
57 #include "content/public/common/content_switches.h" 57 #include "content/public/common/content_switches.h"
58 #include "gpu/ipc/common/gpu_messages.h" 58 #include "gpu/ipc/common/gpu_messages.h"
59 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" 59 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
60 #include "third_party/WebKit/public/web/WebInputEvent.h" 60 #include "third_party/WebKit/public/web/WebInputEvent.h"
61 #include "ui/aura/client/aura_constants.h" 61 #include "ui/aura/client/aura_constants.h"
62 #include "ui/aura/client/cursor_client.h" 62 #include "ui/aura/client/cursor_client.h"
63 #include "ui/aura/client/cursor_client_observer.h" 63 #include "ui/aura/client/cursor_client_observer.h"
64 #include "ui/aura/client/focus_client.h" 64 #include "ui/aura/client/focus_client.h"
65 #include "ui/aura/client/screen_position_client.h" 65 #include "ui/aura/client/screen_position_client.h"
66 #include "ui/aura/client/transient_window_client.h"
66 #include "ui/aura/client/window_parenting_client.h" 67 #include "ui/aura/client/window_parenting_client.h"
67 #include "ui/aura/env.h" 68 #include "ui/aura/env.h"
68 #include "ui/aura/window.h" 69 #include "ui/aura/window.h"
69 #include "ui/aura/window_event_dispatcher.h" 70 #include "ui/aura/window_event_dispatcher.h"
70 #include "ui/aura/window_observer.h" 71 #include "ui/aura/window_observer.h"
71 #include "ui/aura/window_tree_host.h" 72 #include "ui/aura/window_tree_host.h"
72 #include "ui/base/clipboard/scoped_clipboard_writer.h" 73 #include "ui/base/clipboard/scoped_clipboard_writer.h"
73 #include "ui/base/hit_test.h" 74 #include "ui/base/hit_test.h"
74 #include "ui/base/ime/input_method.h" 75 #include "ui/base/ime/input_method.h"
75 #include "ui/base/ui_base_types.h" 76 #include "ui/base/ui_base_types.h"
76 #include "ui/compositor/compositor_vsync_manager.h" 77 #include "ui/compositor/compositor_vsync_manager.h"
77 #include "ui/compositor/dip_util.h" 78 #include "ui/compositor/dip_util.h"
78 #include "ui/display/display.h" 79 #include "ui/display/display.h"
79 #include "ui/display/screen.h" 80 #include "ui/display/screen.h"
80 #include "ui/events/blink/blink_event_util.h" 81 #include "ui/events/blink/blink_event_util.h"
81 #include "ui/events/blink/web_input_event.h" 82 #include "ui/events/blink/web_input_event.h"
82 #include "ui/events/event.h" 83 #include "ui/events/event.h"
83 #include "ui/events/event_utils.h" 84 #include "ui/events/event_utils.h"
84 #include "ui/events/gesture_detection/gesture_configuration.h" 85 #include "ui/events/gesture_detection/gesture_configuration.h"
85 #include "ui/events/gestures/gesture_recognizer.h" 86 #include "ui/events/gestures/gesture_recognizer.h"
86 #include "ui/gfx/canvas.h" 87 #include "ui/gfx/canvas.h"
87 #include "ui/gfx/geometry/dip_util.h" 88 #include "ui/gfx/geometry/dip_util.h"
88 #include "ui/gfx/geometry/rect_conversions.h" 89 #include "ui/gfx/geometry/rect_conversions.h"
89 #include "ui/gfx/geometry/size_conversions.h" 90 #include "ui/gfx/geometry/size_conversions.h"
90 #include "ui/gfx/skia_util.h" 91 #include "ui/gfx/skia_util.h"
91 #include "ui/touch_selection/touch_selection_controller.h" 92 #include "ui/touch_selection/touch_selection_controller.h"
92 #include "ui/wm/public/activation_client.h" 93 #include "ui/wm/public/activation_client.h"
93 #include "ui/wm/public/scoped_tooltip_disabler.h" 94 #include "ui/wm/public/scoped_tooltip_disabler.h"
94 #include "ui/wm/public/tooltip_client.h" 95 #include "ui/wm/public/tooltip_client.h"
95 #include "ui/wm/public/transient_window_client.h"
96 #include "ui/wm/public/window_types.h" 96 #include "ui/wm/public/window_types.h"
97 97
98 #if defined(OS_WIN) 98 #if defined(OS_WIN)
99 #include "base/time/time.h" 99 #include "base/time/time.h"
100 #include "content/browser/accessibility/browser_accessibility_manager_win.h" 100 #include "content/browser/accessibility/browser_accessibility_manager_win.h"
101 #include "content/browser/accessibility/browser_accessibility_win.h" 101 #include "content/browser/accessibility/browser_accessibility_win.h"
102 #include "content/browser/renderer_host/legacy_render_widget_host_win.h" 102 #include "content/browser/renderer_host/legacy_render_widget_host_win.h"
103 #include "ui/base/win/hidden_window.h" 103 #include "ui/base/win/hidden_window.h"
104 #include "ui/base/win/osk_display_manager.h" 104 #include "ui/base/win/osk_display_manager.h"
105 #include "ui/base/win/osk_display_observer.h" 105 #include "ui/base/win/osk_display_observer.h"
(...skipping 2274 matching lines...) Expand 10 before | Expand all | Expand 10 after
2380 2380
2381 void RenderWidgetHostViewAura::SetPopupChild( 2381 void RenderWidgetHostViewAura::SetPopupChild(
2382 RenderWidgetHostViewAura* popup_child_host_view) { 2382 RenderWidgetHostViewAura* popup_child_host_view) {
2383 popup_child_host_view_ = popup_child_host_view; 2383 popup_child_host_view_ = popup_child_host_view;
2384 event_handler_->SetPopupChild( 2384 event_handler_->SetPopupChild(
2385 popup_child_host_view, 2385 popup_child_host_view,
2386 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); 2386 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr);
2387 } 2387 }
2388 2388
2389 } // namespace content 2389 } // namespace content
OLDNEW
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | content/shell/browser/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698