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_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 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 723 bool DesktopRootWindowHostWin::HandleCommand(int command) { | 723 bool DesktopRootWindowHostWin::HandleCommand(int command) { |
| 724 return GetWidget()->widget_delegate()->ExecuteWindowsCommand(command); | 724 return GetWidget()->widget_delegate()->ExecuteWindowsCommand(command); |
| 725 } | 725 } |
| 726 | 726 |
| 727 void DesktopRootWindowHostWin::HandleAccelerator( | 727 void DesktopRootWindowHostWin::HandleAccelerator( |
| 728 const ui::Accelerator& accelerator) { | 728 const ui::Accelerator& accelerator) { |
| 729 GetWidget()->GetFocusManager()->ProcessAccelerator(accelerator); | 729 GetWidget()->GetFocusManager()->ProcessAccelerator(accelerator); |
| 730 } | 730 } |
| 731 | 731 |
| 732 void DesktopRootWindowHostWin::HandleCreate() { | 732 void DesktopRootWindowHostWin::HandleCreate() { |
| 733 ::ShowCursor(true); | |
|
tdanderson
2013/11/22 02:03:36
Adding this line will prevent the problem you desc
tdanderson
2013/11/22 02:27:03
I should add that the |delegate_| in CursorManager
| |
| 734 | |
| 733 // TODO(beng): moar | 735 // TODO(beng): moar |
| 734 NOTIMPLEMENTED(); | 736 NOTIMPLEMENTED(); |
| 735 | 737 |
| 736 native_widget_delegate_->OnNativeWidgetCreated(true); | 738 native_widget_delegate_->OnNativeWidgetCreated(true); |
| 737 | 739 |
| 738 // 1. Window property association | 740 // 1. Window property association |
| 739 // 2. MouseWheel. | 741 // 2. MouseWheel. |
| 740 } | 742 } |
| 741 | 743 |
| 742 void DesktopRootWindowHostWin::HandleDestroying() { | 744 void DesktopRootWindowHostWin::HandleDestroying() { |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 952 | 954 |
| 953 // static | 955 // static |
| 954 DesktopRootWindowHost* DesktopRootWindowHost::Create( | 956 DesktopRootWindowHost* DesktopRootWindowHost::Create( |
| 955 internal::NativeWidgetDelegate* native_widget_delegate, | 957 internal::NativeWidgetDelegate* native_widget_delegate, |
| 956 DesktopNativeWidgetAura* desktop_native_widget_aura) { | 958 DesktopNativeWidgetAura* desktop_native_widget_aura) { |
| 957 return new DesktopRootWindowHostWin(native_widget_delegate, | 959 return new DesktopRootWindowHostWin(native_widget_delegate, |
| 958 desktop_native_widget_aura); | 960 desktop_native_widget_aura); |
| 959 } | 961 } |
| 960 | 962 |
| 961 } // namespace views | 963 } // namespace views |
| OLD | NEW |