Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(693)

Side by Side Diff: ui/views/controls/menu/menu_runner_impl_adapter.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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_
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_runner_impl.h ('k') | ui/views/controls/menu/menu_runner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698