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

Side by Side Diff: components/renderer_context_menu/views/toolkit_delegate_views.h

Issue 1921923002: Convert //components/[o-t]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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 COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_TOOLKIT_DELEGATE_VIEWS_H_ 5 #ifndef COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_TOOLKIT_DELEGATE_VIEWS_H_
6 #define COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_TOOLKIT_DELEGATE_VIEWS_H_ 6 #define COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_TOOLKIT_DELEGATE_VIEWS_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "components/renderer_context_menu/render_view_context_menu_base.h" 11 #include "components/renderer_context_menu/render_view_context_menu_base.h"
10 #include "ui/base/ui_base_types.h" 12 #include "ui/base/ui_base_types.h"
11 13
12 namespace gfx { 14 namespace gfx {
13 class Point; 15 class Point;
14 } 16 }
15 17
16 namespace views { 18 namespace views {
17 class MenuItemView; 19 class MenuItemView;
(...skipping 17 matching lines...) Expand all
35 37
36 private: 38 private:
37 // ToolkitDelegate: 39 // ToolkitDelegate:
38 void Init(ui::SimpleMenuModel* menu_model) override; 40 void Init(ui::SimpleMenuModel* menu_model) override;
39 void Cancel() override; 41 void Cancel() override;
40 void UpdateMenuItem(int command_id, 42 void UpdateMenuItem(int command_id,
41 bool enabled, 43 bool enabled,
42 bool hidden, 44 bool hidden,
43 const base::string16& title) override; 45 const base::string16& title) override;
44 46
45 scoped_ptr<views::MenuModelAdapter> menu_adapter_; 47 std::unique_ptr<views::MenuModelAdapter> menu_adapter_;
46 scoped_ptr<views::MenuRunner> menu_runner_; 48 std::unique_ptr<views::MenuRunner> menu_runner_;
47 49
48 // Weak. Owned by menu_runner_; 50 // Weak. Owned by menu_runner_;
49 views::MenuItemView* menu_view_; 51 views::MenuItemView* menu_view_;
50 52
51 DISALLOW_COPY_AND_ASSIGN(ToolkitDelegateViews); 53 DISALLOW_COPY_AND_ASSIGN(ToolkitDelegateViews);
52 }; 54 };
53 55
54 #endif // COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_TOOLKIT_DELEGATE_VIEWS_H_ 56 #endif // COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_TOOLKIT_DELEGATE_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698