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

Unified Diff: components/arc/test/fake_app_instance.h

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 | « components/arc/BUILD.gn ('k') | components/arc/test/fake_app_instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/test/fake_app_instance.h
diff --git a/components/arc/test/fake_app_instance.h b/components/arc/test/fake_app_instance.h
index 60b702b0c2ab0bfa5cd9d96ea19c64a3c1d44398..c48767632639e1558b8cb3780aaec4f06071b4eb 100644
--- a/components/arc/test/fake_app_instance.h
+++ b/components/arc/test/fake_app_instance.h
@@ -81,42 +81,42 @@ class FakeAppInstance : public mojom::AppInstance {
// mojom::AppInstance overrides:
void Init(mojom::AppHostPtr host_ptr) override {}
void RefreshAppList() override;
- void LaunchApp(const mojo::String& package_name,
- const mojo::String& activity,
+ void LaunchApp(const std::string& package_name,
+ const std::string& activity,
const base::Optional<gfx::Rect>& dimension) override;
- void RequestAppIcon(const mojo::String& package_name,
- const mojo::String& activity,
+ void RequestAppIcon(const std::string& package_name,
+ const std::string& activity,
mojom::ScaleFactor scale_factor) override;
void LaunchIntent(
- const mojo::String& intent_uri,
+ const std::string& intent_uri,
const base::Optional<gfx::Rect>& dimension_on_screen) override;
- void RequestIcon(const mojo::String& icon_resource_id,
+ void RequestIcon(const std::string& icon_resource_id,
mojom::ScaleFactor scale_factor,
const RequestIconCallback& callback) override;
- void RemoveCachedIcon(const mojo::String& icon_resource_id) override;
+ void RemoveCachedIcon(const std::string& icon_resource_id) override;
void CanHandleResolution(
- const mojo::String& package_name,
- const mojo::String& activity,
+ const std::string& package_name,
+ const std::string& activity,
const gfx::Rect& dimension,
const CanHandleResolutionCallback& callback) override;
- void UninstallPackage(const mojo::String& package_name) override;
+ void UninstallPackage(const std::string& package_name) override;
void GetTaskInfo(int32_t task_id,
const GetTaskInfoCallback& callback) override;
void SetTaskActive(int32_t task_id) override;
void CloseTask(int32_t task_id) override;
- void ShowPackageInfoDeprecated(const mojo::String& package_name,
+ void ShowPackageInfoDeprecated(const std::string& package_name,
const gfx::Rect& dimension_on_screen) override;
- void ShowPackageInfoOnPage(const mojo::String& package_name,
+ void ShowPackageInfoOnPage(const std::string& package_name,
mojom::ShowPackageInfoPage page,
const gfx::Rect& dimension_on_screen) override;
- void SetNotificationsEnabled(const mojo::String& package_name,
+ void SetNotificationsEnabled(const std::string& package_name,
bool enabled) override;
void InstallPackage(mojom::ArcPackageInfoPtr arcPackageInfo) override;
// Methods to reply messages.
void SendRefreshAppList(const std::vector<mojom::AppInfo>& apps);
void SendAppAdded(const mojom::AppInfo& app);
- void SendPackageAppListRefreshed(const mojo::String& package_name,
+ void SendPackageAppListRefreshed(const std::string& package_name,
const std::vector<mojom::AppInfo>& apps);
void SendTaskCreated(int32_t taskId, const mojom::AppInfo& app);
void SendTaskDestroyed(int32_t taskId);
@@ -131,7 +131,7 @@ class FakeAppInstance : public mojom::AppInstance {
void SendRefreshPackageList(
const std::vector<mojom::ArcPackageInfo>& packages);
void SendPackageAdded(const mojom::ArcPackageInfo& package);
- void SendPackageUninstalled(const mojo::String& pacakge_name);
+ void SendPackageUninstalled(const std::string& pacakge_name);
int refresh_app_list_count() const { return refresh_app_list_count_; }
@@ -139,7 +139,7 @@ class FakeAppInstance : public mojom::AppInstance {
return launch_requests_;
}
- const std::vector<std::unique_ptr<mojo::String>>& launch_intents() const {
+ const std::vector<std::string>& launch_intents() const {
return launch_intents_;
}
@@ -161,7 +161,7 @@ class FakeAppInstance : public mojom::AppInstance {
// Keeps information about launch requests.
std::vector<std::unique_ptr<Request>> launch_requests_;
// Keeps information about launch intents.
- std::vector<std::unique_ptr<mojo::String>> launch_intents_;
+ std::vector<std::string> launch_intents_;
// Keeps information about icon load requests.
std::vector<std::unique_ptr<IconRequest>> icon_requests_;
// Keeps information about shortcut icon load requests.
« no previous file with comments | « components/arc/BUILD.gn ('k') | components/arc/test/fake_app_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698