| OLD | NEW |
| 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/win/metro.h" | 7 #include "base/win/metro.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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 aura::client::CursorClient* cursor_client = | 153 aura::client::CursorClient* cursor_client = |
| 154 aura::client::GetCursorClient(window()); | 154 aura::client::GetCursorClient(window()); |
| 155 if (cursor_client) | 155 if (cursor_client) |
| 156 is_cursor_visible_ = cursor_client->IsCursorVisible(); | 156 is_cursor_visible_ = cursor_client->IsCursorVisible(); |
| 157 | 157 |
| 158 window()->SetProperty(kContentWindowForRootWindow, content_window_); | 158 window()->SetProperty(kContentWindowForRootWindow, content_window_); |
| 159 window()->SetProperty(kDesktopWindowTreeHostKey, this); | 159 window()->SetProperty(kDesktopWindowTreeHostKey, this); |
| 160 | 160 |
| 161 should_animate_window_close_ = | 161 should_animate_window_close_ = |
| 162 content_window_->type() != ui::wm::WINDOW_TYPE_NORMAL && | 162 content_window_->type() != ui::wm::WINDOW_TYPE_NORMAL && |
| 163 !views::corewm::WindowAnimationsDisabled(content_window_); | 163 !wm::WindowAnimationsDisabled(content_window_); |
| 164 | 164 |
| 165 // TODO this is not invoked *after* Init(), but should be ok. | 165 // TODO this is not invoked *after* Init(), but should be ok. |
| 166 SetWindowTransparency(); | 166 SetWindowTransparency(); |
| 167 } | 167 } |
| 168 | 168 |
| 169 scoped_ptr<corewm::Tooltip> DesktopWindowTreeHostWin::CreateTooltip() { | 169 scoped_ptr<corewm::Tooltip> DesktopWindowTreeHostWin::CreateTooltip() { |
| 170 DCHECK(!tooltip_); | 170 DCHECK(!tooltip_); |
| 171 tooltip_ = new corewm::TooltipWin(GetAcceleratedWidget()); | 171 tooltip_ = new corewm::TooltipWin(GetAcceleratedWidget()); |
| 172 return scoped_ptr<corewm::Tooltip>(tooltip_); | 172 return scoped_ptr<corewm::Tooltip>(tooltip_); |
| 173 } | 173 } |
| (...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1001 | 1001 |
| 1002 // static | 1002 // static |
| 1003 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( | 1003 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( |
| 1004 internal::NativeWidgetDelegate* native_widget_delegate, | 1004 internal::NativeWidgetDelegate* native_widget_delegate, |
| 1005 DesktopNativeWidgetAura* desktop_native_widget_aura) { | 1005 DesktopNativeWidgetAura* desktop_native_widget_aura) { |
| 1006 return new DesktopWindowTreeHostWin(native_widget_delegate, | 1006 return new DesktopWindowTreeHostWin(native_widget_delegate, |
| 1007 desktop_native_widget_aura); | 1007 desktop_native_widget_aura); |
| 1008 } | 1008 } |
| 1009 | 1009 |
| 1010 } // namespace views | 1010 } // namespace views |
| OLD | NEW |