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

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

Issue 2576533003: Converts some services to use aura-mus (Closed)
Patch Set: remove log Created 4 years 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 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "third_party/skia/include/core/SkPath.h" 8 #include "third_party/skia/include/core/SkPath.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 window()->SetProperty(kDesktopWindowTreeHostKey, this); 150 window()->SetProperty(kDesktopWindowTreeHostKey, this);
151 151
152 should_animate_window_close_ = 152 should_animate_window_close_ =
153 content_window_->type() != ui::wm::WINDOW_TYPE_NORMAL && 153 content_window_->type() != ui::wm::WINDOW_TYPE_NORMAL &&
154 !wm::WindowAnimationsDisabled(content_window_); 154 !wm::WindowAnimationsDisabled(content_window_);
155 155
156 // TODO this is not invoked *after* Init(), but should be ok. 156 // TODO this is not invoked *after* Init(), but should be ok.
157 SetWindowTransparency(); 157 SetWindowTransparency();
158 } 158 }
159 159
160 void DesktopWindowTreeHostWin::OnWidgetInitDone() {}
161
160 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostWin::CreateTooltip() { 162 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostWin::CreateTooltip() {
161 DCHECK(!tooltip_); 163 DCHECK(!tooltip_);
162 tooltip_ = new corewm::TooltipWin(GetAcceleratedWidget()); 164 tooltip_ = new corewm::TooltipWin(GetAcceleratedWidget());
163 return base::WrapUnique(tooltip_); 165 return base::WrapUnique(tooltip_);
164 } 166 }
165 167
166 std::unique_ptr<aura::client::DragDropClient> 168 std::unique_ptr<aura::client::DragDropClient>
167 DesktopWindowTreeHostWin::CreateDragDropClient( 169 DesktopWindowTreeHostWin::CreateDragDropClient(
168 DesktopNativeCursorManager* cursor_manager) { 170 DesktopNativeCursorManager* cursor_manager) {
169 drag_drop_client_ = new DesktopDragDropClientWin(window(), GetHWND()); 171 drag_drop_client_ = new DesktopDragDropClientWin(window(), GetHWND());
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
985 987
986 // static 988 // static
987 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( 989 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
988 internal::NativeWidgetDelegate* native_widget_delegate, 990 internal::NativeWidgetDelegate* native_widget_delegate,
989 DesktopNativeWidgetAura* desktop_native_widget_aura) { 991 DesktopNativeWidgetAura* desktop_native_widget_aura) {
990 return new DesktopWindowTreeHostWin(native_widget_delegate, 992 return new DesktopWindowTreeHostWin(native_widget_delegate,
991 desktop_native_widget_aura); 993 desktop_native_widget_aura);
992 } 994 }
993 995
994 } // namespace views 996 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698