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/native_widget_aura.h" | 5 #include "ui/views/widget/native_widget_aura.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.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 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
580 return Widget::MOVE_LOOP_CANCELED; | 580 return Widget::MOVE_LOOP_CANCELED; |
581 } | 581 } |
582 | 582 |
583 void NativeWidgetAura::EndMoveLoop() { | 583 void NativeWidgetAura::EndMoveLoop() { |
584 if (window_->parent() && | 584 if (window_->parent() && |
585 aura::client::GetWindowMoveClient(window_->parent())) { | 585 aura::client::GetWindowMoveClient(window_->parent())) { |
586 aura::client::GetWindowMoveClient(window_->parent())->EndMoveLoop(); | 586 aura::client::GetWindowMoveClient(window_->parent())->EndMoveLoop(); |
587 } | 587 } |
588 } | 588 } |
589 | 589 |
590 void NativeWidgetAura::SetVisibilityChangedAnimationsEnabled(bool value) { | 590 void NativeWidgetAura::SetVisibilityChangedAnimationsEnabled(bool value) { |
Ben Goodger (Google)
2012/01/24 04:39:13
Huh. I guess I forgot about this one. Was this fro
| |
591 // Nothing needed on aura. | 591 window_->SetIntProperty(aura::client::kAnimationsDisabledKey, value ? 0 : 1); |
592 } | 592 } |
593 | 593 |
594 //////////////////////////////////////////////////////////////////////////////// | 594 //////////////////////////////////////////////////////////////////////////////// |
595 // NativeWidgetAura, views::InputMethodDelegate implementation: | 595 // NativeWidgetAura, views::InputMethodDelegate implementation: |
596 | 596 |
597 void NativeWidgetAura::DispatchKeyEventPostIME(const KeyEvent& key) { | 597 void NativeWidgetAura::DispatchKeyEventPostIME(const KeyEvent& key) { |
598 FocusManager* focus_manager = GetWidget()->GetFocusManager(); | 598 FocusManager* focus_manager = GetWidget()->GetFocusManager(); |
599 if (focus_manager) | 599 if (focus_manager) |
600 focus_manager->MaybeResetMenuKeyState(key); | 600 focus_manager->MaybeResetMenuKeyState(key); |
601 if (delegate_->OnKeyEvent(key) || !focus_manager) | 601 if (delegate_->OnKeyEvent(key) || !focus_manager) |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
876 } | 876 } |
877 } | 877 } |
878 | 878 |
879 // static | 879 // static |
880 bool NativeWidgetPrivate::IsMouseButtonDown() { | 880 bool NativeWidgetPrivate::IsMouseButtonDown() { |
881 return aura::RootWindow::GetInstance()->IsMouseButtonDown(); | 881 return aura::RootWindow::GetInstance()->IsMouseButtonDown(); |
882 } | 882 } |
883 | 883 |
884 } // namespace internal | 884 } // namespace internal |
885 } // namespace views | 885 } // namespace views |
OLD | NEW |