Chromium Code Reviews| 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 "ui/aura/client/activation_client.h" | 8 #include "ui/aura/client/activation_client.h" |
| 9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
| 10 #include "ui/aura/client/stacking_client.h" | 10 #include "ui/aura/client/stacking_client.h" |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 537 return desktop_root_window_host_->GetWorkAreaBoundsInScreen(); | 537 return desktop_root_window_host_->GetWorkAreaBoundsInScreen(); |
| 538 } | 538 } |
| 539 | 539 |
| 540 void DesktopNativeWidgetAura::SetInactiveRenderingDisabled(bool value) { | 540 void DesktopNativeWidgetAura::SetInactiveRenderingDisabled(bool value) { |
| 541 if (!value) { | 541 if (!value) { |
| 542 active_window_observer_.reset(); | 542 active_window_observer_.reset(); |
| 543 } else { | 543 } else { |
| 544 active_window_observer_.reset( | 544 active_window_observer_.reset( |
| 545 new NativeWidgetAuraWindowObserver(window_, native_widget_delegate_)); | 545 new NativeWidgetAuraWindowObserver(window_, native_widget_delegate_)); |
| 546 } | 546 } |
| 547 desktop_root_window_host_->AlwaysPaintActivated(value); | |
|
sky
2013/04/23 14:15:54
Can you make this match the already existing name,
ananta
2013/04/23 18:10:07
Done.
| |
| 547 } | 548 } |
| 548 | 549 |
| 549 Widget::MoveLoopResult DesktopNativeWidgetAura::RunMoveLoop( | 550 Widget::MoveLoopResult DesktopNativeWidgetAura::RunMoveLoop( |
| 550 const gfx::Vector2d& drag_offset, | 551 const gfx::Vector2d& drag_offset, |
| 551 Widget::MoveLoopSource source) { | 552 Widget::MoveLoopSource source) { |
| 552 return desktop_root_window_host_->RunMoveLoop(drag_offset, source); | 553 return desktop_root_window_host_->RunMoveLoop(drag_offset, source); |
| 553 } | 554 } |
| 554 | 555 |
| 555 void DesktopNativeWidgetAura::EndMoveLoop() { | 556 void DesktopNativeWidgetAura::EndMoveLoop() { |
| 556 desktop_root_window_host_->EndMoveLoop(); | 557 desktop_root_window_host_->EndMoveLoop(); |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 818 drop_helper_->OnDragExit(); | 819 drop_helper_->OnDragExit(); |
| 819 } | 820 } |
| 820 | 821 |
| 821 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) { | 822 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) { |
| 822 DCHECK(drop_helper_.get() != NULL); | 823 DCHECK(drop_helper_.get() != NULL); |
| 823 return drop_helper_->OnDrop(event.data(), event.location(), | 824 return drop_helper_->OnDrop(event.data(), event.location(), |
| 824 last_drop_operation_); | 825 last_drop_operation_); |
| 825 } | 826 } |
| 826 | 827 |
| 827 } // namespace views | 828 } // namespace views |
| OLD | NEW |