| 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_win.h" | 5 #include "ui/views/widget/native_widget_win.h" |
| 6 | 6 |
| 7 #include <dwmapi.h> | 7 #include <dwmapi.h> |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 906 return false; | 906 return false; |
| 907 } | 907 } |
| 908 | 908 |
| 909 namespace internal { | 909 namespace internal { |
| 910 | 910 |
| 911 //////////////////////////////////////////////////////////////////////////////// | 911 //////////////////////////////////////////////////////////////////////////////// |
| 912 // internal::NativeWidgetPrivate, public: | 912 // internal::NativeWidgetPrivate, public: |
| 913 | 913 |
| 914 // static | 914 // static |
| 915 NativeWidgetPrivate* NativeWidgetPrivate::CreateNativeWidget( | 915 NativeWidgetPrivate* NativeWidgetPrivate::CreateNativeWidget( |
| 916 internal::NativeWidgetDelegate* delegate) { | 916 internal::NativeWidgetDelegate* delegate, |
| 917 return new NativeWidgetWin(delegate); | 917 gfx::NativeView parent) { |
| 918 return new NativeWidgetWin(delegate, parent); |
| 918 } | 919 } |
| 919 | 920 |
| 920 // static | 921 // static |
| 921 NativeWidgetPrivate* NativeWidgetPrivate::GetNativeWidgetForNativeView( | 922 NativeWidgetPrivate* NativeWidgetPrivate::GetNativeWidgetForNativeView( |
| 922 gfx::NativeView native_view) { | 923 gfx::NativeView native_view) { |
| 923 return reinterpret_cast<NativeWidgetWin*>( | 924 return reinterpret_cast<NativeWidgetWin*>( |
| 924 ViewProp::GetValue(native_view, kNativeWidgetKey)); | 925 ViewProp::GetValue(native_view, kNativeWidgetKey)); |
| 925 } | 926 } |
| 926 | 927 |
| 927 // static | 928 // static |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1025 // static | 1026 // static |
| 1026 bool NativeWidgetPrivate::IsTouchDown() { | 1027 bool NativeWidgetPrivate::IsTouchDown() { |
| 1027 // This currently isn't necessary because we're not generating touch events on | 1028 // This currently isn't necessary because we're not generating touch events on |
| 1028 // windows. When we do, this will need to be updated. | 1029 // windows. When we do, this will need to be updated. |
| 1029 return false; | 1030 return false; |
| 1030 } | 1031 } |
| 1031 | 1032 |
| 1032 } // namespace internal | 1033 } // namespace internal |
| 1033 | 1034 |
| 1034 } // namespace views | 1035 } // namespace views |
| OLD | NEW |