| 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_CONTROLS_MENU_MENU_RUNNER_IMPL_ADAPTER_H_ | 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_ADAPTER_H_ |
| 6 #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_ADAPTER_H_ | 6 #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_ADAPTER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 MenuButton* button, | 27 MenuButton* button, |
| 28 const gfx::Rect& bounds, | 28 const gfx::Rect& bounds, |
| 29 MenuAnchorPosition anchor, | 29 MenuAnchorPosition anchor, |
| 30 int32_t types) override; | 30 int32_t types) override; |
| 31 void Cancel() override; | 31 void Cancel() override; |
| 32 base::TimeDelta GetClosingEventTime() const override; | 32 base::TimeDelta GetClosingEventTime() const override; |
| 33 | 33 |
| 34 private: | 34 private: |
| 35 ~MenuRunnerImplAdapter() override; | 35 ~MenuRunnerImplAdapter() override; |
| 36 | 36 |
| 37 scoped_ptr<MenuModelAdapter> menu_model_adapter_; | 37 std::unique_ptr<MenuModelAdapter> menu_model_adapter_; |
| 38 MenuRunnerImpl* impl_; | 38 MenuRunnerImpl* impl_; |
| 39 | 39 |
| 40 DISALLOW_COPY_AND_ASSIGN(MenuRunnerImplAdapter); | 40 DISALLOW_COPY_AND_ASSIGN(MenuRunnerImplAdapter); |
| 41 }; | 41 }; |
| 42 | 42 |
| 43 } // namespace internal | 43 } // namespace internal |
| 44 } // namespace views | 44 } // namespace views |
| 45 | 45 |
| 46 #endif // UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_ADAPTER_H_ | 46 #endif // UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_ADAPTER_H_ |
| OLD | NEW |