| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ | 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ |
| 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ | 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "ui/gfx/native_widget_types.h" | 9 #include "ui/gfx/native_widget_types.h" |
| 9 #include "ui/views/widget/native_widget_private.h" | 10 #include "ui/views/widget/native_widget_private.h" |
| 10 | 11 |
| 11 #if defined(__OBJC__) | 12 #if defined(__OBJC__) |
| 12 @class NativeWidgetMacNSWindow; | 13 @class NativeWidgetMacNSWindow; |
| 13 #else | 14 #else |
| 14 class NativeWidgetMacNSWindow; | 15 class NativeWidgetMacNSWindow; |
| 15 #endif | 16 #endif |
| 16 | 17 |
| 17 namespace views { | 18 namespace views { |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 scoped_ptr<BridgedNativeWidget> bridge_; | 149 scoped_ptr<BridgedNativeWidget> bridge_; |
| 149 | 150 |
| 150 Widget::InitParams::Ownership ownership_; | 151 Widget::InitParams::Ownership ownership_; |
| 151 | 152 |
| 152 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMac); | 153 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMac); |
| 153 }; | 154 }; |
| 154 | 155 |
| 155 } // namespace views | 156 } // namespace views |
| 156 | 157 |
| 157 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ | 158 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1543173002:
Switch to standard integer types in ui/views/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master