| 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 #ifndef UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ | 5 #ifndef UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ |
| 6 #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ | 6 #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "build/build_config.h" |
| 9 #include "ui/views/views_delegate.h" | 11 #include "ui/views/views_delegate.h" |
| 10 | 12 |
| 11 namespace wm { | 13 namespace wm { |
| 12 class WMState; | 14 class WMState; |
| 13 } | 15 } |
| 14 | 16 |
| 15 namespace views { | 17 namespace views { |
| 16 | 18 |
| 17 class TestViewsDelegate : public ViewsDelegate { | 19 class TestViewsDelegate : public ViewsDelegate { |
| 18 public: | 20 public: |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 #if defined(USE_AURA) | 53 #if defined(USE_AURA) |
| 52 scoped_ptr<wm::WMState> wm_state_; | 54 scoped_ptr<wm::WMState> wm_state_; |
| 53 #endif | 55 #endif |
| 54 | 56 |
| 55 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); | 57 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); |
| 56 }; | 58 }; |
| 57 | 59 |
| 58 } // namespace views | 60 } // namespace views |
| 59 | 61 |
| 60 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ | 62 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_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