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

Side by Side Diff: ui/app_list/views/apps_grid_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/views/app_list_view_unittest.cc ('k') | ui/app_list/views/apps_grid_view.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_APP_LIST_VIEWS_APPS_GRID_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 472
473 AppListModel* model_; // Owned by AppListView. 473 AppListModel* model_; // Owned by AppListView.
474 AppListItemList* item_list_; // Not owned. 474 AppListItemList* item_list_; // Not owned.
475 AppsGridViewDelegate* delegate_; 475 AppsGridViewDelegate* delegate_;
476 476
477 // This can be NULL. Only grid views inside folders have a folder delegate. 477 // This can be NULL. Only grid views inside folders have a folder delegate.
478 AppsGridViewFolderDelegate* folder_delegate_; 478 AppsGridViewFolderDelegate* folder_delegate_;
479 479
480 PaginationModel pagination_model_; 480 PaginationModel pagination_model_;
481 // Must appear after |pagination_model_|. 481 // Must appear after |pagination_model_|.
482 scoped_ptr<PaginationController> pagination_controller_; 482 std::unique_ptr<PaginationController> pagination_controller_;
483 PageSwitcher* page_switcher_view_; // Owned by views hierarchy. 483 PageSwitcher* page_switcher_view_; // Owned by views hierarchy.
484 484
485 int cols_; 485 int cols_;
486 int rows_per_page_; 486 int rows_per_page_;
487 487
488 // List of app item views. There is a view per item in |model_|. 488 // List of app item views. There is a view per item in |model_|.
489 views::ViewModelT<AppListItemView> view_model_; 489 views::ViewModelT<AppListItemView> view_model_;
490 490
491 // List of pulsing block views. 491 // List of pulsing block views.
492 views::ViewModelT<PulsingBlockView> pulsing_blocks_model_; 492 views::ViewModelT<PulsingBlockView> pulsing_blocks_model_;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 575
576 // True if the drag_view_ item is a folder item being dragged for reparenting. 576 // True if the drag_view_ item is a folder item being dragged for reparenting.
577 bool dragging_for_reparent_item_; 577 bool dragging_for_reparent_item_;
578 578
579 DISALLOW_COPY_AND_ASSIGN(AppsGridView); 579 DISALLOW_COPY_AND_ASSIGN(AppsGridView);
580 }; 580 };
581 581
582 } // namespace app_list 582 } // namespace app_list
583 583
584 #endif // UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_ 584 #endif // UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.cc ('k') | ui/app_list/views/apps_grid_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698