| 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/controls/menu/menu_runner.h" | 5 #include "ui/views/controls/menu/menu_runner.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ui/views/controls/menu/menu_runner_handler.h" | 9 #include "ui/views/controls/menu/menu_runner_handler.h" |
| 10 #include "ui/views/controls/menu/menu_runner_impl.h" | 10 #include "ui/views/controls/menu/menu_runner_impl.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 | 65 |
| 66 void MenuRunner::Cancel() { | 66 void MenuRunner::Cancel() { |
| 67 impl_->Cancel(); | 67 impl_->Cancel(); |
| 68 } | 68 } |
| 69 | 69 |
| 70 base::TimeDelta MenuRunner::closing_event_time() const { | 70 base::TimeDelta MenuRunner::closing_event_time() const { |
| 71 return impl_->GetClosingEventTime(); | 71 return impl_->GetClosingEventTime(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 void MenuRunner::SetRunnerHandler( | 74 void MenuRunner::SetRunnerHandler( |
| 75 scoped_ptr<MenuRunnerHandler> runner_handler) { | 75 std::unique_ptr<MenuRunnerHandler> runner_handler) { |
| 76 runner_handler_ = std::move(runner_handler); | 76 runner_handler_ = std::move(runner_handler); |
| 77 } | 77 } |
| 78 | 78 |
| 79 } // namespace views | 79 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1868363002:
Replace scoped_ptr with std::unique_ptr in //ui (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc