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

Side by Side Diff: ui/app_list/views/search_result_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/search_result_tile_item_view.h ('k') | ui/app_list/views/speech_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 (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_SEARCH_RESULT_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_
6 #define UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory>
10 #include <string> 11 #include <string>
11 #include <vector> 12 #include <vector>
12 13
13 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
17 #include "ui/app_list/search_result_observer.h" 17 #include "ui/app_list/search_result_observer.h"
18 #include "ui/app_list/views/search_result_actions_view_delegate.h" 18 #include "ui/app_list/views/search_result_actions_view_delegate.h"
19 #include "ui/views/context_menu_controller.h" 19 #include "ui/views/context_menu_controller.h"
20 #include "ui/views/controls/button/custom_button.h" 20 #include "ui/views/controls/button/custom_button.h"
21 21
22 namespace gfx { 22 namespace gfx {
23 class RenderText; 23 class RenderText;
24 } 24 }
25 25
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 SearchResult* result_; // Owned by AppListModel::SearchResults. 110 SearchResult* result_; // Owned by AppListModel::SearchResults.
111 111
112 bool is_last_result_; 112 bool is_last_result_;
113 113
114 // Parent list view. Owned by views hierarchy. 114 // Parent list view. Owned by views hierarchy.
115 SearchResultListView* list_view_; 115 SearchResultListView* list_view_;
116 116
117 views::ImageView* icon_; // Owned by views hierarchy. 117 views::ImageView* icon_; // Owned by views hierarchy.
118 views::ImageView* badge_icon_; // Owned by views hierarchy. 118 views::ImageView* badge_icon_; // Owned by views hierarchy.
119 scoped_ptr<gfx::RenderText> title_text_; 119 std::unique_ptr<gfx::RenderText> title_text_;
120 scoped_ptr<gfx::RenderText> details_text_; 120 std::unique_ptr<gfx::RenderText> details_text_;
121 SearchResultActionsView* actions_view_; // Owned by the views hierarchy. 121 SearchResultActionsView* actions_view_; // Owned by the views hierarchy.
122 ProgressBarView* progress_bar_; // Owned by views hierarchy. 122 ProgressBarView* progress_bar_; // Owned by views hierarchy.
123 123
124 scoped_ptr<views::MenuRunner> context_menu_runner_; 124 std::unique_ptr<views::MenuRunner> context_menu_runner_;
125 125
126 DISALLOW_COPY_AND_ASSIGN(SearchResultView); 126 DISALLOW_COPY_AND_ASSIGN(SearchResultView);
127 }; 127 };
128 128
129 } // namespace app_list 129 } // namespace app_list
130 130
131 #endif // UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_ 131 #endif // UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/search_result_tile_item_view.h ('k') | ui/app_list/views/speech_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698