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

Side by Side Diff: components/arc/test/fake_app_instance.cc

Issue 2364113002: Replace deprecated ScopedVector<T> in arc::FakeAppInstance (Closed)
Patch Set: Clean up header inclusions Created 4 years, 3 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 | « components/arc/test/fake_app_instance.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "components/arc/test/fake_app_instance.h" 5 #include "components/arc/test/fake_app_instance.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
13 #include "base/files/file_util.h" 14 #include "base/files/file_util.h"
15 #include "base/memory/ptr_util.h"
14 #include "base/path_service.h" 16 #include "base/path_service.h"
15 #include "base/run_loop.h" 17 #include "base/run_loop.h"
16 #include "mojo/common/common_type_converters.h" 18 #include "mojo/common/common_type_converters.h"
17 19
18 namespace mojo { 20 namespace mojo {
19 21
20 template <> 22 template <>
21 struct TypeConverter<arc::mojom::AppInfoPtr, arc::mojom::AppInfo> { 23 struct TypeConverter<arc::mojom::AppInfoPtr, arc::mojom::AppInfo> {
22 static arc::mojom::AppInfoPtr Convert(const arc::mojom::AppInfo& app_info) { 24 static arc::mojom::AppInfoPtr Convert(const arc::mojom::AppInfo& app_info) {
23 return app_info.Clone(); 25 return app_info.Clone();
(...skipping 17 matching lines...) Expand all
41 : app_host_(app_host) {} 43 : app_host_(app_host) {}
42 FakeAppInstance::~FakeAppInstance() {} 44 FakeAppInstance::~FakeAppInstance() {}
43 45
44 void FakeAppInstance::RefreshAppList() { 46 void FakeAppInstance::RefreshAppList() {
45 ++refresh_app_list_count_; 47 ++refresh_app_list_count_;
46 } 48 }
47 49
48 void FakeAppInstance::LaunchApp(const mojo::String& package_name, 50 void FakeAppInstance::LaunchApp(const mojo::String& package_name,
49 const mojo::String& activity, 51 const mojo::String& activity,
50 const base::Optional<gfx::Rect>& dimension) { 52 const base::Optional<gfx::Rect>& dimension) {
51 launch_requests_.push_back(new Request(package_name, activity)); 53 launch_requests_.push_back(base::MakeUnique<Request>(package_name, activity));
52 } 54 }
53 55
54 void FakeAppInstance::RequestAppIcon(const mojo::String& package_name, 56 void FakeAppInstance::RequestAppIcon(const mojo::String& package_name,
55 const mojo::String& activity, 57 const mojo::String& activity,
56 mojom::ScaleFactor scale_factor) { 58 mojom::ScaleFactor scale_factor) {
57 icon_requests_.push_back( 59 icon_requests_.push_back(
58 new IconRequest(package_name, activity, scale_factor)); 60 base::MakeUnique<IconRequest>(package_name, activity, scale_factor));
59 } 61 }
60 62
61 void FakeAppInstance::SendRefreshAppList( 63 void FakeAppInstance::SendRefreshAppList(
62 const std::vector<mojom::AppInfo>& apps) { 64 const std::vector<mojom::AppInfo>& apps) {
63 app_host_->OnAppListRefreshed(mojo::Array<mojom::AppInfoPtr>::From(apps)); 65 app_host_->OnAppListRefreshed(mojo::Array<mojom::AppInfoPtr>::From(apps));
64 } 66 }
65 67
66 void FakeAppInstance::SendPackageAppListRefreshed( 68 void FakeAppInstance::SendPackageAppListRefreshed(
67 const mojo::String& package_name, 69 const mojo::String& package_name,
68 const std::vector<mojom::AppInfo>& apps) { 70 const std::vector<mojom::AppInfo>& apps) {
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 bool enabled) { 220 bool enabled) {
219 } 221 }
220 222
221 void FakeAppInstance::InstallPackage(mojom::ArcPackageInfoPtr arcPackageInfo) { 223 void FakeAppInstance::InstallPackage(mojom::ArcPackageInfoPtr arcPackageInfo) {
222 app_host_->OnPackageAdded(std::move(arcPackageInfo)); 224 app_host_->OnPackageAdded(std::move(arcPackageInfo));
223 } 225 }
224 226
225 void FakeAppInstance::LaunchIntent( 227 void FakeAppInstance::LaunchIntent(
226 const mojo::String& intent_uri, 228 const mojo::String& intent_uri,
227 const base::Optional<gfx::Rect>& dimension_on_screen) { 229 const base::Optional<gfx::Rect>& dimension_on_screen) {
228 launch_intents_.push_back(new mojo::String(intent_uri)); 230 launch_intents_.push_back(base::MakeUnique<mojo::String>(intent_uri));
229 } 231 }
230 232
231 void FakeAppInstance::RequestIcon(const mojo::String& icon_resource_id, 233 void FakeAppInstance::RequestIcon(const mojo::String& icon_resource_id,
232 arc::mojom::ScaleFactor scale_factor, 234 arc::mojom::ScaleFactor scale_factor,
233 const RequestIconCallback& callback) { 235 const RequestIconCallback& callback) {
234 shortcut_icon_requests_.push_back( 236 shortcut_icon_requests_.push_back(
235 new ShortcutIconRequest(icon_resource_id, scale_factor)); 237 base::MakeUnique<ShortcutIconRequest>(icon_resource_id, scale_factor));
236 238
237 std::string png_data_as_string; 239 std::string png_data_as_string;
238 if (GetFakeIcon(scale_factor, &png_data_as_string)) { 240 if (GetFakeIcon(scale_factor, &png_data_as_string)) {
239 callback.Run(mojo::Array<uint8_t>::From(png_data_as_string)); 241 callback.Run(mojo::Array<uint8_t>::From(png_data_as_string));
240 } 242 }
241 } 243 }
242 244
243 void FakeAppInstance::RemoveCachedIcon(const mojo::String& icon_resource_id) {} 245 void FakeAppInstance::RemoveCachedIcon(const mojo::String& icon_resource_id) {}
244 246
245 } // namespace arc 247 } // namespace arc
OLDNEW
« no previous file with comments | « components/arc/test/fake_app_instance.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698