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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

Issue 11878013: Make ui_controls only usable from interactive_ui_tests. This has two benefits: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « ui/ui_controls/ui_controls_internal_win.h ('k') | no next file » | 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 "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h"
6 6
7 #include "third_party/skia/include/core/SkPath.h" 7 #include "third_party/skia/include/core/SkPath.h"
8 #include "third_party/skia/include/core/SkRegion.h" 8 #include "third_party/skia/include/core/SkRegion.h"
9 #include "ui/aura/client/aura_constants.h" 9 #include "ui/aura/client/aura_constants.h"
10 #include "ui/aura/client/default_capture_client.h" 10 #include "ui/aura/client/default_capture_client.h"
11 #include "ui/aura/focus_manager.h" 11 #include "ui/aura/focus_manager.h"
12 #include "ui/aura/root_window.h" 12 #include "ui/aura/root_window.h"
13 #include "ui/aura/ui_controls_aura.h"
14 #include "ui/aura/window_property.h" 13 #include "ui/aura/window_property.h"
15 #include "ui/base/cursor/cursor_loader_win.h" 14 #include "ui/base/cursor/cursor_loader_win.h"
16 #include "ui/base/ime/input_method_win.h" 15 #include "ui/base/ime/input_method_win.h"
17 #include "ui/base/win/shell.h" 16 #include "ui/base/win/shell.h"
18 #include "ui/gfx/native_widget_types.h" 17 #include "ui/gfx/native_widget_types.h"
19 #include "ui/gfx/path_win.h" 18 #include "ui/gfx/path_win.h"
20 #include "ui/native_theme/native_theme_aura.h" 19 #include "ui/native_theme/native_theme_aura.h"
21 #include "ui/native_theme/native_theme_win.h" 20 #include "ui/native_theme/native_theme_win.h"
22 #include "ui/ui_controls/ui_controls.h"
23 #include "ui/views/corewm/compound_event_filter.h" 21 #include "ui/views/corewm/compound_event_filter.h"
24 #include "ui/views/corewm/input_method_event_filter.h" 22 #include "ui/views/corewm/input_method_event_filter.h"
25 #include "ui/views/ime/input_method_bridge.h" 23 #include "ui/views/ime/input_method_bridge.h"
26 #include "ui/views/widget/desktop_aura/desktop_activation_client.h" 24 #include "ui/views/widget/desktop_aura/desktop_activation_client.h"
27 #include "ui/views/widget/desktop_aura/desktop_cursor_client.h" 25 #include "ui/views/widget/desktop_aura/desktop_cursor_client.h"
28 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h" 26 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
29 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h" 27 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h"
30 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 28 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
31 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h" 29 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
32 #include "ui/views/widget/root_view.h" 30 #include "ui/views/widget/root_view.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 136
139 desktop_native_widget_aura_->InstallInputMethodEventFilter(root_window_); 137 desktop_native_widget_aura_->InstallInputMethodEventFilter(root_window_);
140 138
141 drag_drop_client_.reset(new DesktopDragDropClientWin(root_window_, 139 drag_drop_client_.reset(new DesktopDragDropClientWin(root_window_,
142 GetHWND())); 140 GetHWND()));
143 aura::client::SetDragDropClient(root_window_, drag_drop_client_.get()); 141 aura::client::SetDragDropClient(root_window_, drag_drop_client_.get());
144 142
145 focus_client_->FocusWindow(content_window_); 143 focus_client_->FocusWindow(content_window_);
146 root_window_->SetProperty(kContentWindowForRootWindow, content_window_); 144 root_window_->SetProperty(kContentWindowForRootWindow, content_window_);
147 145
148 ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_));
149 return root_window_; 146 return root_window_;
150 } 147 }
151 148
152 void DesktopRootWindowHostWin::Close() { 149 void DesktopRootWindowHostWin::Close() {
153 message_handler_->Close(); 150 message_handler_->Close();
154 } 151 }
155 152
156 void DesktopRootWindowHostWin::CloseNow() { 153 void DesktopRootWindowHostWin::CloseNow() {
157 message_handler_->CloseNow(); 154 message_handler_->CloseNow();
158 } 155 }
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 DesktopRootWindowHost* DesktopRootWindowHost::Create( 767 DesktopRootWindowHost* DesktopRootWindowHost::Create(
771 internal::NativeWidgetDelegate* native_widget_delegate, 768 internal::NativeWidgetDelegate* native_widget_delegate,
772 DesktopNativeWidgetAura* desktop_native_widget_aura, 769 DesktopNativeWidgetAura* desktop_native_widget_aura,
773 const gfx::Rect& initial_bounds) { 770 const gfx::Rect& initial_bounds) {
774 return new DesktopRootWindowHostWin(native_widget_delegate, 771 return new DesktopRootWindowHostWin(native_widget_delegate,
775 desktop_native_widget_aura, 772 desktop_native_widget_aura,
776 initial_bounds); 773 initial_bounds);
777 } 774 }
778 775
779 } // namespace views 776 } // namespace views
OLDNEW
« no previous file with comments | « ui/ui_controls/ui_controls_internal_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698