| 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_native_widget_aura.h" | 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "ui/aura/client/activation_client.h" | 9 #include "ui/aura/client/activation_client.h" |
| 10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 } | 521 } |
| 522 | 522 |
| 523 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() { | 523 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() { |
| 524 return desktop_root_window_host_->CreateNonClientFrameView(); | 524 return desktop_root_window_host_->CreateNonClientFrameView(); |
| 525 } | 525 } |
| 526 | 526 |
| 527 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const { | 527 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const { |
| 528 return desktop_root_window_host_->ShouldUseNativeFrame(); | 528 return desktop_root_window_host_->ShouldUseNativeFrame(); |
| 529 } | 529 } |
| 530 | 530 |
| 531 void DesktopNativeWidgetAura::FrameTypeChanged() { | 531 void DesktopNativeWidgetAura::FrameTypeChanged(Widget::FrameType new_type) { |
| 532 desktop_root_window_host_->FrameTypeChanged(); | 532 desktop_root_window_host_->FrameTypeChanged(new_type); |
| 533 UpdateWindowTransparency(); | 533 UpdateWindowTransparency(); |
| 534 } | 534 } |
| 535 | 535 |
| 536 Widget* DesktopNativeWidgetAura::GetWidget() { | 536 Widget* DesktopNativeWidgetAura::GetWidget() { |
| 537 return native_widget_delegate_->AsWidget(); | 537 return native_widget_delegate_->AsWidget(); |
| 538 } | 538 } |
| 539 | 539 |
| 540 const Widget* DesktopNativeWidgetAura::GetWidget() const { | 540 const Widget* DesktopNativeWidgetAura::GetWidget() const { |
| 541 return native_widget_delegate_->AsWidget(); | 541 return native_widget_delegate_->AsWidget(); |
| 542 } | 542 } |
| (...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1160 bool transparent = false; | 1160 bool transparent = false; |
| 1161 #if defined(OS_WIN) | 1161 #if defined(OS_WIN) |
| 1162 // On Windows, a native frame implies Glass, so the window should be | 1162 // On Windows, a native frame implies Glass, so the window should be |
| 1163 // transparent. | 1163 // transparent. |
| 1164 transparent = ShouldUseNativeFrame(); | 1164 transparent = ShouldUseNativeFrame(); |
| 1165 #endif | 1165 #endif |
| 1166 content_window_->SetTransparent(transparent); | 1166 content_window_->SetTransparent(transparent); |
| 1167 } | 1167 } |
| 1168 | 1168 |
| 1169 } // namespace views | 1169 } // namespace views |
| OLD | NEW |