| 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_root_window_host_win.h" | 5 #include "ui/views/widget/desktop_aura/desktop_root_window_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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 void DesktopRootWindowHostWin::OnRootWindowCreated( | 149 void DesktopRootWindowHostWin::OnRootWindowCreated( |
| 150 aura::RootWindow* root, | 150 aura::RootWindow* root, |
| 151 const Widget::InitParams& params) { | 151 const Widget::InitParams& params) { |
| 152 root_window_ = root; | 152 root_window_ = root; |
| 153 | 153 |
| 154 root_window_->window()->SetProperty(kContentWindowForRootWindow, | 154 root_window_->window()->SetProperty(kContentWindowForRootWindow, |
| 155 content_window_); | 155 content_window_); |
| 156 root_window_->window()->SetProperty(kDesktopRootWindowHostKey, this); | 156 root_window_->window()->SetProperty(kDesktopRootWindowHostKey, this); |
| 157 | 157 |
| 158 should_animate_window_close_ = | 158 should_animate_window_close_ = |
| 159 content_window_->type() != aura::client::WINDOW_TYPE_NORMAL && | 159 content_window_->type() != ui::wm::WINDOW_TYPE_NORMAL && |
| 160 !views::corewm::WindowAnimationsDisabled(content_window_); | 160 !views::corewm::WindowAnimationsDisabled(content_window_); |
| 161 | 161 |
| 162 // TODO this is not invoked *after* Init(), but should be ok. | 162 // TODO this is not invoked *after* Init(), but should be ok. |
| 163 SetWindowTransparency(); | 163 SetWindowTransparency(); |
| 164 } | 164 } |
| 165 | 165 |
| 166 scoped_ptr<corewm::Tooltip> DesktopRootWindowHostWin::CreateTooltip() { | 166 scoped_ptr<corewm::Tooltip> DesktopRootWindowHostWin::CreateTooltip() { |
| 167 DCHECK(!tooltip_); | 167 DCHECK(!tooltip_); |
| 168 tooltip_ = new corewm::TooltipWin(GetAcceleratedWidget()); | 168 tooltip_ = new corewm::TooltipWin(GetAcceleratedWidget()); |
| 169 return scoped_ptr<corewm::Tooltip>(tooltip_); | 169 return scoped_ptr<corewm::Tooltip>(tooltip_); |
| (...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 966 | 966 |
| 967 // static | 967 // static |
| 968 DesktopRootWindowHost* DesktopRootWindowHost::Create( | 968 DesktopRootWindowHost* DesktopRootWindowHost::Create( |
| 969 internal::NativeWidgetDelegate* native_widget_delegate, | 969 internal::NativeWidgetDelegate* native_widget_delegate, |
| 970 DesktopNativeWidgetAura* desktop_native_widget_aura) { | 970 DesktopNativeWidgetAura* desktop_native_widget_aura) { |
| 971 return new DesktopRootWindowHostWin(native_widget_delegate, | 971 return new DesktopRootWindowHostWin(native_widget_delegate, |
| 972 desktop_native_widget_aura); | 972 desktop_native_widget_aura); |
| 973 } | 973 } |
| 974 | 974 |
| 975 } // namespace views | 975 } // namespace views |
| OLD | NEW |