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

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

Issue 11368010: Move aura shared and desktop classes to the views target. Note that the files don't actually move, … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/widget/desktop_root_window_host_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_root_window_host_win.h" 5 #include "ui/views/widget/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/desktop/desktop_activation_client.h" 11 #include "ui/aura/desktop/desktop_activation_client.h"
11 #include "ui/aura/desktop/desktop_cursor_client.h" 12 #include "ui/aura/desktop/desktop_cursor_client.h"
12 #include "ui/aura/desktop/desktop_dispatcher_client.h" 13 #include "ui/aura/desktop/desktop_dispatcher_client.h"
13 #include "ui/aura/focus_manager.h" 14 #include "ui/aura/focus_manager.h"
14 #include "ui/aura/root_window.h" 15 #include "ui/aura/root_window.h"
15 #include "ui/aura/shared/compound_event_filter.h" 16 #include "ui/aura/shared/compound_event_filter.h"
16 #include "ui/aura/shared/input_method_event_filter.h" 17 #include "ui/aura/shared/input_method_event_filter.h"
17 #include "ui/aura/window_property.h" 18 #include "ui/aura/window_property.h"
18 #include "ui/base/cursor/cursor_loader_win.h" 19 #include "ui/base/cursor/cursor_loader_win.h"
19 #include "ui/base/native_theme/native_theme_aura.h" 20 #include "ui/base/native_theme/native_theme_aura.h"
20 #include "ui/base/native_theme/native_theme_win.h" 21 #include "ui/base/native_theme/native_theme_win.h"
21 #include "ui/base/win/shell.h" 22 #include "ui/base/win/shell.h"
22 #include "ui/gfx/native_widget_types.h" 23 #include "ui/gfx/native_widget_types.h"
23 #include "ui/gfx/path_win.h" 24 #include "ui/gfx/path_win.h"
24 #include "ui/views/ime/input_method_win.h" 25 #include "ui/views/ime/input_method_win.h"
25 #include "ui/views/widget/desktop_capture_client.h"
26 #include "ui/views/widget/desktop_native_widget_aura.h" 26 #include "ui/views/widget/desktop_native_widget_aura.h"
27 #include "ui/views/widget/desktop_screen_position_client.h" 27 #include "ui/views/widget/desktop_screen_position_client.h"
28 #include "ui/views/widget/widget_delegate.h" 28 #include "ui/views/widget/widget_delegate.h"
29 #include "ui/views/widget/widget_hwnd_utils.h" 29 #include "ui/views/widget/widget_hwnd_utils.h"
30 #include "ui/views/win/fullscreen_handler.h" 30 #include "ui/views/win/fullscreen_handler.h"
31 #include "ui/views/win/hwnd_message_handler.h" 31 #include "ui/views/win/hwnd_message_handler.h"
32 #include "ui/views/window/native_frame_view.h" 32 #include "ui/views/window/native_frame_view.h"
33 33
34 namespace views { 34 namespace views {
35 35
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // now in the hack-n-slash days of win-aura, we can just 100 // now in the hack-n-slash days of win-aura, we can just
101 // unilaterally turn this on. 101 // unilaterally turn this on.
102 root_window_->compositor()->SetHostHasTransparentBackground(true); 102 root_window_->compositor()->SetHostHasTransparentBackground(true);
103 root_window_->SetTransparent(true); 103 root_window_->SetTransparent(true);
104 104
105 root_window_->Init(); 105 root_window_->Init();
106 root_window_->AddChild(content_window_); 106 root_window_->AddChild(content_window_);
107 107
108 native_widget_delegate_->OnNativeWidgetCreated(); 108 native_widget_delegate_->OnNativeWidgetCreated();
109 109
110 capture_client_.reset(new DesktopCaptureClient); 110 capture_client_.reset(new aura::client::DefaultCaptureClient(root_window_));
111 aura::client::SetCaptureClient(root_window_, capture_client_.get()); 111 aura::client::SetCaptureClient(root_window_, capture_client_.get());
112 112
113 focus_manager_.reset(new aura::FocusManager); 113 focus_manager_.reset(new aura::FocusManager);
114 root_window_->set_focus_manager(focus_manager_.get()); 114 root_window_->set_focus_manager(focus_manager_.get());
115 115
116 activation_client_.reset( 116 activation_client_.reset(
117 new aura::DesktopActivationClient(root_window_->GetFocusManager())); 117 new aura::DesktopActivationClient(root_window_->GetFocusManager()));
118 aura::client::SetActivationClient(root_window_, 118 aura::client::SetActivationClient(root_window_,
119 activation_client_.get()); 119 activation_client_.get());
120 120
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 DesktopRootWindowHost* DesktopRootWindowHost::Create( 775 DesktopRootWindowHost* DesktopRootWindowHost::Create(
776 internal::NativeWidgetDelegate* native_widget_delegate, 776 internal::NativeWidgetDelegate* native_widget_delegate,
777 DesktopNativeWidgetAura* desktop_native_widget_aura, 777 DesktopNativeWidgetAura* desktop_native_widget_aura,
778 const gfx::Rect& initial_bounds) { 778 const gfx::Rect& initial_bounds) {
779 return new DesktopRootWindowHostWin(native_widget_delegate, 779 return new DesktopRootWindowHostWin(native_widget_delegate,
780 desktop_native_widget_aura, 780 desktop_native_widget_aura,
781 initial_bounds); 781 initial_bounds);
782 } 782 }
783 783
784 } // namespace views 784 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_root_window_host_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698