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

Side by Side Diff: ui/views/examples/tree_view_example.h

Issue 2379863002: Fix object ownership in ui/base/models. (Closed)
Patch Set: fix Created 4 years, 2 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
« no previous file with comments | « ui/views/controls/tree/tree_view_unittest.cc ('k') | ui/views/examples/tree_view_example.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_EXAMPLES_TREE_VIEW_EXAMPLE_H_ 5 #ifndef UI_VIEWS_EXAMPLES_TREE_VIEW_EXAMPLE_H_
6 #define UI_VIEWS_EXAMPLES_TREE_VIEW_EXAMPLE_H_ 6 #define UI_VIEWS_EXAMPLES_TREE_VIEW_EXAMPLE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/base/models/simple_menu_model.h" 9 #include "ui/base/models/simple_menu_model.h"
10 #include "ui/base/models/tree_node_model.h" 10 #include "ui/base/models/tree_node_model.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 void ShowContextMenuForView(View* source, 63 void ShowContextMenuForView(View* source,
64 const gfx::Point& point, 64 const gfx::Point& point,
65 ui::MenuSourceType source_type) override; 65 ui::MenuSourceType source_type) override;
66 66
67 // SimpleMenuModel::Delegate: 67 // SimpleMenuModel::Delegate:
68 bool IsCommandIdChecked(int command_id) const override; 68 bool IsCommandIdChecked(int command_id) const override;
69 bool IsCommandIdEnabled(int command_id) const override; 69 bool IsCommandIdEnabled(int command_id) const override;
70 void ExecuteCommand(int command_id, int event_flags) override; 70 void ExecuteCommand(int command_id, int event_flags) override;
71 71
72 // The tree view to be tested. 72 // The tree view to be tested.
73 TreeView* tree_view_; 73 std::unique_ptr<TreeView> tree_view_;
74 74
75 // Control buttons to modify the model. 75 // Control buttons to modify the model.
76 LabelButton* add_; 76 LabelButton* add_;
77 LabelButton* remove_; 77 LabelButton* remove_;
78 LabelButton* change_title_; 78 LabelButton* change_title_;
79 79
80 typedef ui::TreeNodeWithValue<int> NodeType; 80 typedef ui::TreeNodeWithValue<int> NodeType;
81 81
82 ui::TreeNodeModel<NodeType> model_; 82 ui::TreeNodeModel<NodeType> model_;
83 83
84 std::unique_ptr<ui::SimpleMenuModel> context_menu_model_; 84 std::unique_ptr<ui::SimpleMenuModel> context_menu_model_;
85 std::unique_ptr<MenuRunner> context_menu_runner_; 85 std::unique_ptr<MenuRunner> context_menu_runner_;
86 86
87 DISALLOW_COPY_AND_ASSIGN(TreeViewExample); 87 DISALLOW_COPY_AND_ASSIGN(TreeViewExample);
88 }; 88 };
89 89
90 } // namespace examples 90 } // namespace examples
91 } // namespace views 91 } // namespace views
92 92
93 #endif // UI_VIEWS_EXAMPLES_TREE_VIEW_EXAMPLE_H_ 93 #endif // UI_VIEWS_EXAMPLES_TREE_VIEW_EXAMPLE_H_
OLDNEW
« no previous file with comments | « ui/views/controls/tree/tree_view_unittest.cc ('k') | ui/views/examples/tree_view_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698