Change namespace chromeos => ash for //c/b/ash/apps
Code in //chrome/browser/ash/apps is a part of the ash-chrome, so
namespace is changed to ash from chromeos.
Change-Id: Ib21147594e71cebb7cc91b23f14a4415002f14ab
Bug: 1164001
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2739180
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Commit-Queue: Yeunjoo Choi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#860714}
diff --git a/chrome/browser/apps/digital_goods/util.cc b/chrome/browser/apps/digital_goods/util.cc
index b7396ea..688a2cf 100644
--- a/chrome/browser/apps/digital_goods/util.cc
+++ b/chrome/browser/apps/digital_goods/util.cc
@@ -33,7 +33,7 @@
return "";
}
- auto* apk_web_app_service = chromeos::ApkWebAppService::Get(profile);
+ auto* apk_web_app_service = ash::ApkWebAppService::Get(profile);
if (!apk_web_app_service) {
return "";
}
diff --git a/chrome/browser/ash/apps/apk_web_app_installer.cc b/chrome/browser/ash/apps/apk_web_app_installer.cc
index bf480ad0..1c2f1fc3 100644
--- a/chrome/browser/ash/apps/apk_web_app_installer.cc
+++ b/chrome/browser/ash/apps/apk_web_app_installer.cc
@@ -28,7 +28,7 @@
static_cast<int64_t>(std::numeric_limits<int32_t>::max()) + 1;
}
-namespace chromeos {
+namespace ash {
// static
void ApkWebAppInstaller::Install(Profile* profile,
@@ -170,4 +170,4 @@
base::Unretained(this), std::move(start_url)));
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/apps/apk_web_app_installer.h b/chrome/browser/ash/apps/apk_web_app_installer.h
index 717147a..2c35664 100644
--- a/chrome/browser/ash/apps/apk_web_app_installer.h
+++ b/chrome/browser/ash/apps/apk_web_app_installer.h
@@ -23,7 +23,7 @@
enum class InstallResultCode;
}
-namespace chromeos {
+namespace ash {
// Class which takes an arc::mojom::WebAppInfo struct and decodes the data
// within it to install as a local web app.
@@ -94,6 +94,6 @@
DISALLOW_COPY_AND_ASSIGN(ApkWebAppInstaller);
};
-} // namespace chromeos
+} // namespace ash
#endif // CHROME_BROWSER_ASH_APPS_APK_WEB_APP_INSTALLER_H_
diff --git a/chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc b/chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc
index 7291884..4af0dde 100644
--- a/chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc
+++ b/chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc
@@ -53,7 +53,7 @@
} // namespace
-namespace chromeos {
+namespace ash {
class ApkWebAppInstallerBrowserTest : public InProcessBrowserTest,
public web_app::AppRegistrarObserver,
@@ -467,4 +467,4 @@
}
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc b/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc
index 6c30c1d..a7f9893 100644
--- a/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc
+++ b/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc
@@ -42,7 +42,7 @@
} // namespace
-namespace chromeos {
+namespace ash {
class FakeApkWebAppInstaller : public ApkWebAppInstaller {
public:
@@ -188,4 +188,4 @@
EXPECT_FALSE(apk_web_app_installer.has_web_app_info());
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/apps/apk_web_app_service.cc b/chrome/browser/ash/apps/apk_web_app_service.cc
index dc077ef3..a0b3c65 100644
--- a/chrome/browser/ash/apps/apk_web_app_service.cc
+++ b/chrome/browser/ash/apps/apk_web_app_service.cc
@@ -62,7 +62,7 @@
} // namespace
-namespace chromeos {
+namespace ash {
// static
ApkWebAppService* ApkWebAppService::Get(Profile* profile) {
@@ -499,4 +499,4 @@
base::Value(web_app_info->certificate_sha256_fingerprint.value()));
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/apps/apk_web_app_service.h b/chrome/browser/ash/apps/apk_web_app_service.h
index b154537..87d70637 100644
--- a/chrome/browser/ash/apps/apk_web_app_service.h
+++ b/chrome/browser/ash/apps/apk_web_app_service.h
@@ -33,7 +33,7 @@
class WebAppProvider;
} // namespace web_app
-namespace chromeos {
+namespace ash {
class ApkWebAppService : public KeyedService,
public ApkWebAppInstaller::Owner,
@@ -121,6 +121,6 @@
DISALLOW_COPY_AND_ASSIGN(ApkWebAppService);
};
-} // namespace chromeos
+} // namespace ash
#endif // CHROME_BROWSER_ASH_APPS_APK_WEB_APP_SERVICE_H_
diff --git a/chrome/browser/ash/apps/apk_web_app_service_factory.cc b/chrome/browser/ash/apps/apk_web_app_service_factory.cc
index eef736f..8cc0c21 100644
--- a/chrome/browser/ash/apps/apk_web_app_service_factory.cc
+++ b/chrome/browser/ash/apps/apk_web_app_service_factory.cc
@@ -12,7 +12,7 @@
#include "chrome/browser/web_applications/web_app_provider_factory.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
-namespace chromeos {
+namespace ash {
// static
ApkWebAppService* ApkWebAppServiceFactory::GetForProfile(Profile* profile) {
@@ -54,4 +54,4 @@
return chrome::GetBrowserContextRedirectedInIncognito(context);
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/apps/apk_web_app_service_factory.h b/chrome/browser/ash/apps/apk_web_app_service_factory.h
index 0301de4..c90e15e 100644
--- a/chrome/browser/ash/apps/apk_web_app_service_factory.h
+++ b/chrome/browser/ash/apps/apk_web_app_service_factory.h
@@ -15,7 +15,7 @@
class Profile;
-namespace chromeos {
+namespace ash {
class ApkWebAppService;
@@ -48,6 +48,6 @@
DISALLOW_COPY_AND_ASSIGN(ApkWebAppServiceFactory);
};
-} // namespace chromeos
+} // namespace ash
#endif // CHROME_BROWSER_ASH_APPS_APK_WEB_APP_SERVICE_FACTORY_H_
diff --git a/chrome/browser/chromeos/arc/session/arc_service_launcher.cc b/chrome/browser/chromeos/arc/session/arc_service_launcher.cc
index 1dfba0a..5e8afab0 100644
--- a/chrome/browser/chromeos/arc/session/arc_service_launcher.cc
+++ b/chrome/browser/chromeos/arc/session/arc_service_launcher.cc
@@ -252,7 +252,7 @@
GpuArcVideoKeyedService::GetForBrowserContext(profile);
CertStoreService::GetForBrowserContext(profile);
apps::ArcAppsFactory::GetForProfile(profile);
- chromeos::ApkWebAppService::Get(profile);
+ ash::ApkWebAppService::Get(profile);
chromeos::full_restore::FullRestoreArcTaskHandler::GetForProfile(profile);
// ARC Container-only services.
diff --git a/chrome/browser/payments/chrome_payment_request_delegate.cc b/chrome/browser/payments/chrome_payment_request_delegate.cc
index 9132132..1ba576e 100644
--- a/chrome/browser/payments/chrome_payment_request_delegate.cc
+++ b/chrome/browser/payments/chrome_payment_request_delegate.cc
@@ -279,7 +279,7 @@
if (!web_app::AppBrowserController::IsWebApp(browser))
return "";
- auto* apk_web_app_service = chromeos::ApkWebAppService::Get(
+ auto* apk_web_app_service = ash::ApkWebAppService::Get(
Profile::FromBrowserContext(rfh->GetBrowserContext()));
if (!apk_web_app_service)
return "";
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 63269424..46b5653 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1035,7 +1035,7 @@
ArcAppListPrefs::RegisterProfilePrefs(registry);
certificate_manager::CertificatesHandler::RegisterProfilePrefs(registry);
ash::AccountManager::RegisterPrefs(registry);
- chromeos::ApkWebAppService::RegisterProfilePrefs(registry);
+ ash::ApkWebAppService::RegisterProfilePrefs(registry);
chromeos::app_time::AppActivityRegistry::RegisterProfilePrefs(registry);
chromeos::app_time::AppTimeController::RegisterProfilePrefs(registry);
chromeos::assistant::prefs::RegisterProfilePrefs(registry);
diff --git a/chrome/browser/ui/ash/chrome_new_window_client.cc b/chrome/browser/ui/ash/chrome_new_window_client.cc
index af1c1d1d..b361eeb 100644
--- a/chrome/browser/ui/ash/chrome_new_window_client.cc
+++ b/chrome/browser/ui/ash/chrome_new_window_client.cc
@@ -532,8 +532,8 @@
proxy->LaunchAppWithUrl(*app_id, event_flags, url,
apps::mojom::LaunchSource::kFromArc);
- chromeos::ApkWebAppService* apk_web_app_service =
- chromeos::ApkWebAppService::Get(profile);
+ ash::ApkWebAppService* apk_web_app_service =
+ ash::ApkWebAppService::Get(profile);
if (!apk_web_app_service ||
!apk_web_app_service->IsWebAppInstalledFromArc(app_id.value())) {
return;
diff --git a/chrome/browser/ui/web_applications/web_app_browser_controller.cc b/chrome/browser/ui/web_applications/web_app_browser_controller.cc
index d7fdb4d..a5cdc21 100644
--- a/chrome/browser/ui/web_applications/web_app_browser_controller.cc
+++ b/chrome/browser/ui/web_applications/web_app_browser_controller.cc
@@ -289,8 +289,8 @@
if (!HasAppId())
return;
- chromeos::ApkWebAppService* apk_web_app_service =
- chromeos::ApkWebAppService::Get(browser->profile());
+ ash::ApkWebAppService* apk_web_app_service =
+ ash::ApkWebAppService::Get(browser->profile());
if (!apk_web_app_service || !apk_web_app_service->IsWebOnlyTwa(GetAppId()))
return;
