Index: components/arc/test/fake_app_instance.cc |
diff --git a/components/arc/test/fake_app_instance.cc b/components/arc/test/fake_app_instance.cc |
index a3d5a568b240abd060e891b8becd2ced37d0cfca..5b1a353979d1bf4c353a5f43249b3a90c88988f7 100644 |
--- a/components/arc/test/fake_app_instance.cc |
+++ b/components/arc/test/fake_app_instance.cc |
@@ -18,8 +18,8 @@ |
namespace mojo { |
template <> |
-struct TypeConverter<arc::AppInfoPtr, arc::AppInfo> { |
- static arc::AppInfoPtr Convert(const arc::AppInfo& app_info) { |
+struct TypeConverter<arc::mojom::AppInfoPtr, arc::mojom::AppInfo> { |
+ static arc::mojom::AppInfoPtr Convert(const arc::mojom::AppInfo& app_info) { |
return app_info.Clone(); |
} |
}; |
@@ -28,7 +28,7 @@ struct TypeConverter<arc::AppInfoPtr, arc::AppInfo> { |
namespace arc { |
-FakeAppInstance::FakeAppInstance(AppHost* app_host) |
+FakeAppInstance::FakeAppInstance(mojom::AppHost* app_host) |
: binding_(this), app_host_(app_host) {} |
FakeAppInstance::~FakeAppInstance() {} |
@@ -38,52 +38,53 @@ void FakeAppInstance::RefreshAppList() { |
void FakeAppInstance::LaunchApp(const mojo::String& package_name, |
const mojo::String& activity, |
- ScreenRectPtr dimension) { |
+ mojom::ScreenRectPtr dimension) { |
launch_requests_.push_back(new Request(package_name, activity)); |
} |
void FakeAppInstance::RequestAppIcon(const mojo::String& package_name, |
const mojo::String& activity, |
- ScaleFactor scale_factor) { |
+ mojom::ScaleFactor scale_factor) { |
icon_requests_.push_back( |
new IconRequest(package_name, activity, scale_factor)); |
} |
-void FakeAppInstance::SendRefreshAppList(const std::vector<AppInfo>& apps) { |
- app_host_->OnAppListRefreshed(mojo::Array<AppInfoPtr>::From(apps)); |
+void FakeAppInstance::SendRefreshAppList( |
+ const std::vector<mojom::AppInfo>& apps) { |
+ app_host_->OnAppListRefreshed(mojo::Array<mojom::AppInfoPtr>::From(apps)); |
} |
-bool FakeAppInstance::GenerateAndSendIcon(const AppInfo& app, |
- ScaleFactor scale_factor, |
+bool FakeAppInstance::GenerateAndSendIcon(const mojom::AppInfo& app, |
+ mojom::ScaleFactor scale_factor, |
std::string* png_data_as_string) { |
CHECK(png_data_as_string != nullptr); |
std::string icon_file_name; |
switch (scale_factor) { |
- case ScaleFactor::SCALE_FACTOR_100P: |
+ case mojom::ScaleFactor::SCALE_FACTOR_100P: |
icon_file_name = "icon_100p.png"; |
break; |
- case ScaleFactor::SCALE_FACTOR_125P: |
+ case mojom::ScaleFactor::SCALE_FACTOR_125P: |
icon_file_name = "icon_125p.png"; |
break; |
- case ScaleFactor::SCALE_FACTOR_133P: |
+ case mojom::ScaleFactor::SCALE_FACTOR_133P: |
icon_file_name = "icon_133p.png"; |
break; |
- case ScaleFactor::SCALE_FACTOR_140P: |
+ case mojom::ScaleFactor::SCALE_FACTOR_140P: |
icon_file_name = "icon_140p.png"; |
break; |
- case ScaleFactor::SCALE_FACTOR_150P: |
+ case mojom::ScaleFactor::SCALE_FACTOR_150P: |
icon_file_name = "icon_150p.png"; |
break; |
- case ScaleFactor::SCALE_FACTOR_180P: |
+ case mojom::ScaleFactor::SCALE_FACTOR_180P: |
icon_file_name = "icon_180p.png"; |
break; |
- case ScaleFactor::SCALE_FACTOR_200P: |
+ case mojom::ScaleFactor::SCALE_FACTOR_200P: |
icon_file_name = "icon_200p.png"; |
break; |
- case ScaleFactor::SCALE_FACTOR_250P: |
+ case mojom::ScaleFactor::SCALE_FACTOR_250P: |
icon_file_name = "icon_250p.png"; |
break; |
- case ScaleFactor::SCALE_FACTOR_300P: |
+ case mojom::ScaleFactor::SCALE_FACTOR_300P: |
icon_file_name = "icon_300p.png"; |
break; |
default: |
@@ -132,9 +133,10 @@ void FakeAppInstance::WaitForOnAppInstanceReady() { |
} |
} |
-void FakeAppInstance::CanHandleResolution(const mojo::String& package_name, |
+void FakeAppInstance::CanHandleResolution( |
+ const mojo::String& package_name, |
const mojo::String& activity, |
- ScreenRectPtr dimension, |
+ mojom::ScreenRectPtr dimension, |
const CanHandleResolutionCallback& callback) { |
callback.Run(true); |
} |