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

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc

Issue 2503633003: arc: enable use_new_wrapper_types for app.mojom (Closed)
Patch Set: rebase again Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_unittest.cc ('k') | components/arc/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
index 5cf8f9edb4af5e31fd1d77dbb049e4b5040e92df..9aa7fcc9e9a809b556fe2c376d27ba39344daefc 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
@@ -57,25 +57,26 @@ std::string GetTestApp2Id() {
return ArcAppListPrefs::GetAppId(kTestAppPackage, kTestAppActivity2);
}
-mojo::Array<arc::mojom::AppInfoPtr> GetTestAppsList(bool multi_app) {
- std::vector<arc::mojom::AppInfo> apps;
+std::vector<arc::mojom::AppInfoPtr> GetTestAppsList(bool multi_app) {
+ std::vector<arc::mojom::AppInfoPtr> apps;
- arc::mojom::AppInfo app;
- app.name = kTestAppName;
- app.package_name = kTestAppPackage;
- app.activity = kTestAppActivity;
- app.sticky = false;
- apps.push_back(app);
+ arc::mojom::AppInfoPtr app(arc::mojom::AppInfo::New());
+ app->name = kTestAppName;
+ app->package_name = kTestAppPackage;
+ app->activity = kTestAppActivity;
+ app->sticky = false;
+ apps.push_back(std::move(app));
if (multi_app) {
- app.name = kTestAppName2;
- app.package_name = kTestAppPackage;
- app.activity = kTestAppActivity2;
- app.sticky = false;
- apps.push_back(app);
+ app = arc::mojom::AppInfo::New();
+ app->name = kTestAppName2;
+ app->package_name = kTestAppPackage;
+ app->activity = kTestAppActivity2;
+ app->sticky = false;
+ apps.push_back(std::move(app));
}
- return mojo::Array<arc::mojom::AppInfoPtr>::From(apps);
+ return apps;
}
ChromeLauncherController* chrome_controller() {
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_unittest.cc ('k') | components/arc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698