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

Side by Side Diff: ui/app_list/test/app_list_test_view_delegate.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/app_list_test_model.cc ('k') | ui/app_list/test/test_search_result.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_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_ 5 #ifndef UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_
6 #define UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_ 6 #define UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory>
11 #include <string> 12 #include <string>
12 #include <vector> 13 #include <vector>
13 14
14 #include "base/callback_forward.h" 15 #include "base/callback_forward.h"
15 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
16 #include "base/macros.h" 17 #include "base/macros.h"
17 #include "base/memory/scoped_ptr.h"
18 #include "base/observer_list.h" 18 #include "base/observer_list.h"
19 #include "ui/app_list/app_list_view_delegate.h" 19 #include "ui/app_list/app_list_view_delegate.h"
20 #include "ui/app_list/speech_ui_model.h" 20 #include "ui/app_list/speech_ui_model.h"
21 21
22 namespace app_list { 22 namespace app_list {
23 namespace test { 23 namespace test {
24 24
25 class AppListTestModel; 25 class AppListTestModel;
26 26
27 // A concrete AppListViewDelegate for unit tests. 27 // A concrete AppListViewDelegate for unit tests.
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 AppListTestModel* ReleaseTestModel() { return model_.release(); } 98 AppListTestModel* ReleaseTestModel() { return model_.release(); }
99 AppListTestModel* GetTestModel() { return model_.get(); } 99 AppListTestModel* GetTestModel() { return model_.get(); }
100 100
101 private: 101 private:
102 int dismiss_count_; 102 int dismiss_count_;
103 int stop_speech_recognition_count_; 103 int stop_speech_recognition_count_;
104 int open_search_result_count_; 104 int open_search_result_count_;
105 int next_profile_app_count_; 105 int next_profile_app_count_;
106 std::map<size_t, int> open_search_result_counts_; 106 std::map<size_t, int> open_search_result_counts_;
107 Users users_; 107 Users users_;
108 scoped_ptr<AppListTestModel> model_; 108 std::unique_ptr<AppListTestModel> model_;
109 base::ObserverList<AppListViewDelegateObserver> observers_; 109 base::ObserverList<AppListViewDelegateObserver> observers_;
110 SpeechUIModel speech_ui_; 110 SpeechUIModel speech_ui_;
111 base::TimeDelta auto_launch_timeout_; 111 base::TimeDelta auto_launch_timeout_;
112 112
113 DISALLOW_COPY_AND_ASSIGN(AppListTestViewDelegate); 113 DISALLOW_COPY_AND_ASSIGN(AppListTestViewDelegate);
114 }; 114 };
115 115
116 } // namespace test 116 } // namespace test
117 } // namespace app_list 117 } // namespace app_list
118 118
119 #endif // UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_ 119 #endif // UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/app_list/test/app_list_test_model.cc ('k') | ui/app_list/test/test_search_result.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698