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

Side by Side Diff: ui/app_list/views/app_list_folder_view.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
« no previous file with comments | « ui/app_list/test/test_search_result.cc ('k') | ui/app_list/views/app_list_item_view.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 bool cancel_drag) override; 104 bool cancel_drag) override;
105 bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) override; 105 bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) override;
106 bool IsOEMFolder() const override; 106 bool IsOEMFolder() const override;
107 void SetRootLevelDragViewVisible(bool visible) override; 107 void SetRootLevelDragViewVisible(bool visible) override;
108 108
109 AppsContainerView* container_view_; // Not owned. 109 AppsContainerView* container_view_; // Not owned.
110 AppListMainView* app_list_main_view_; // Not Owned. 110 AppListMainView* app_list_main_view_; // Not Owned.
111 FolderHeaderView* folder_header_view_; // Owned by views hierarchy. 111 FolderHeaderView* folder_header_view_; // Owned by views hierarchy.
112 AppsGridView* items_grid_view_; // Owned by the views hierarchy. 112 AppsGridView* items_grid_view_; // Owned by the views hierarchy.
113 113
114 scoped_ptr<views::ViewModel> view_model_; 114 std::unique_ptr<views::ViewModel> view_model_;
115 115
116 AppListModel* model_; // Not owned. 116 AppListModel* model_; // Not owned.
117 AppListFolderItem* folder_item_; // Not owned. 117 AppListFolderItem* folder_item_; // Not owned.
118 118
119 bool hide_for_reparent_; 119 bool hide_for_reparent_;
120 120
121 base::string16 accessible_name_; 121 base::string16 accessible_name_;
122 122
123 DISALLOW_COPY_AND_ASSIGN(AppListFolderView); 123 DISALLOW_COPY_AND_ASSIGN(AppListFolderView);
124 }; 124 };
125 125
126 } // namespace app_list 126 } // namespace app_list
127 127
128 #endif // UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 128 #endif // UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/test/test_search_result.cc ('k') | ui/app_list/views/app_list_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698