Commit 231b42e0 authored by Nicholas Hollingum's avatar Nicholas Hollingum Committed by Commit Bot

Rename LinuxCredits -> CrostiniCredits w.r.t. chrome:// URLs

As part of fixing the credits, we will rename the url so it is clearer
that it refers specifically to the crostini subsystem.

Bug: 970621
Change-Id: I5cea2ec71116fb7d699c8b54848e5c545671a11c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2038293Reviewed-by: default avatarcalamity <calamity@chromium.org>
Commit-Queue: Nic Hollingum <hollingum@google.com>
Cr-Commit-Position: refs/heads/master@{#738816}
parent 7b275432
...@@ -429,24 +429,24 @@ class ChromeOSCreditsHandler ...@@ -429,24 +429,24 @@ class ChromeOSCreditsHandler
DISALLOW_COPY_AND_ASSIGN(ChromeOSCreditsHandler); DISALLOW_COPY_AND_ASSIGN(ChromeOSCreditsHandler);
}; };
class LinuxCreditsHandler class CrostiniCreditsHandler
: public base::RefCountedThreadSafe<LinuxCreditsHandler> { : public base::RefCountedThreadSafe<CrostiniCreditsHandler> {
public: public:
static void Start(const std::string& path, static void Start(const std::string& path,
content::URLDataSource::GotDataCallback callback) { content::URLDataSource::GotDataCallback callback) {
scoped_refptr<LinuxCreditsHandler> handler( scoped_refptr<CrostiniCreditsHandler> handler(
new LinuxCreditsHandler(path, std::move(callback))); new CrostiniCreditsHandler(path, std::move(callback)));
handler->StartOnUIThread(); handler->StartOnUIThread();
} }
private: private:
friend class base::RefCountedThreadSafe<LinuxCreditsHandler>; friend class base::RefCountedThreadSafe<CrostiniCreditsHandler>;
LinuxCreditsHandler(const std::string& path, CrostiniCreditsHandler(const std::string& path,
content::URLDataSource::GotDataCallback callback) content::URLDataSource::GotDataCallback callback)
: path_(path), callback_(std::move(callback)) {} : path_(path), callback_(std::move(callback)) {}
virtual ~LinuxCreditsHandler() {} virtual ~CrostiniCreditsHandler() {}
void StartOnUIThread() { void StartOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
...@@ -461,11 +461,11 @@ class LinuxCreditsHandler ...@@ -461,11 +461,11 @@ class LinuxCreditsHandler
base::PostTaskAndReply( base::PostTaskAndReply(
FROM_HERE, FROM_HERE,
{base::ThreadPool(), base::MayBlock(), base::TaskPriority::BEST_EFFORT}, {base::ThreadPool(), base::MayBlock(), base::TaskPriority::BEST_EFFORT},
base::Bind(&LinuxCreditsHandler::LoadLinuxCreditsFileAsync, this), base::Bind(&CrostiniCreditsHandler::LoadCrostiniCreditsFileAsync, this),
base::Bind(&LinuxCreditsHandler::ResponseOnUIThread, this)); base::Bind(&CrostiniCreditsHandler::ResponseOnUIThread, this));
} }
void LoadLinuxCreditsFileAsync() { void LoadCrostiniCreditsFileAsync() {
base::FilePath credits_file_path(chrome::kLinuxCreditsPath); base::FilePath credits_file_path(chrome::kLinuxCreditsPath);
if (!base::ReadFileToString(credits_file_path, &contents_)) { if (!base::ReadFileToString(credits_file_path, &contents_)) {
// File with credits not found, ResponseOnUIThread will load credits // File with credits not found, ResponseOnUIThread will load credits
...@@ -496,7 +496,7 @@ class LinuxCreditsHandler ...@@ -496,7 +496,7 @@ class LinuxCreditsHandler
// Linux credits contents that was loaded from file. // Linux credits contents that was loaded from file.
std::string contents_; std::string contents_;
DISALLOW_COPY_AND_ASSIGN(LinuxCreditsHandler); DISALLOW_COPY_AND_ASSIGN(CrostiniCreditsHandler);
}; };
#endif #endif
...@@ -625,8 +625,8 @@ void AboutUIHTMLSource::StartDataRequest( ...@@ -625,8 +625,8 @@ void AboutUIHTMLSource::StartDataRequest(
} else if (source_name_ == chrome::kChromeUIOSCreditsHost) { } else if (source_name_ == chrome::kChromeUIOSCreditsHost) {
ChromeOSCreditsHandler::Start(path, std::move(callback)); ChromeOSCreditsHandler::Start(path, std::move(callback));
return; return;
} else if (source_name_ == chrome::kChromeUILinuxCreditsHost) { } else if (source_name_ == chrome::kChromeUICrostiniCreditsHost) {
LinuxCreditsHandler::Start(path, std::move(callback)); CrostiniCreditsHandler::Start(path, std::move(callback));
return; return;
#endif #endif
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
...@@ -665,7 +665,7 @@ std::string AboutUIHTMLSource::GetMimeType(const std::string& path) { ...@@ -665,7 +665,7 @@ std::string AboutUIHTMLSource::GetMimeType(const std::string& path) {
bool AboutUIHTMLSource::ShouldAddContentSecurityPolicy() { bool AboutUIHTMLSource::ShouldAddContentSecurityPolicy() {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
if (source_name_ == chrome::kChromeUIOSCreditsHost || if (source_name_ == chrome::kChromeUIOSCreditsHost ||
source_name_ == chrome::kChromeUILinuxCreditsHost) { source_name_ == chrome::kChromeUICrostiniCreditsHost) {
return false; return false;
} }
#endif #endif
......
...@@ -342,7 +342,7 @@ bool IsAboutUI(const GURL& url) { ...@@ -342,7 +342,7 @@ bool IsAboutUI(const GURL& url) {
#endif #endif
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
|| url.host_piece() == chrome::kChromeUIOSCreditsHost || || url.host_piece() == chrome::kChromeUIOSCreditsHost ||
url.host_piece() == chrome::kChromeUILinuxCreditsHost url.host_piece() == chrome::kChromeUICrostiniCreditsHost
#endif #endif
); // NOLINT ); // NOLINT
} }
......
...@@ -351,7 +351,7 @@ AboutHandler* AboutHandler::Create(content::WebUIDataSource* html_source, ...@@ -351,7 +351,7 @@ AboutHandler* AboutHandler::Create(content::WebUIDataSource* html_source,
base::string16 os_with_linux_license = l10n_util::GetStringFUTF16( base::string16 os_with_linux_license = l10n_util::GetStringFUTF16(
IDS_ABOUT_CROS_WITH_LINUX_VERSION_LICENSE, IDS_ABOUT_CROS_WITH_LINUX_VERSION_LICENSE,
base::ASCIIToUTF16(chrome::kChromeUIOSCreditsURL), base::ASCIIToUTF16(chrome::kChromeUIOSCreditsURL),
base::ASCIIToUTF16(chrome::kChromeUILinuxCreditsURL)); base::ASCIIToUTF16(chrome::kChromeUICrostiniCreditsURL));
html_source->AddString("aboutProductOsWithLinuxLicense", html_source->AddString("aboutProductOsWithLinuxLicense",
os_with_linux_license); os_with_linux_license);
html_source->AddBoolean("aboutEnterpriseManaged", IsEnterpriseManaged()); html_source->AddBoolean("aboutEnterpriseManaged", IsEnterpriseManaged());
......
...@@ -237,8 +237,8 @@ const char kChromeUIIntenetDetailDialogURL[] = ...@@ -237,8 +237,8 @@ const char kChromeUIIntenetDetailDialogURL[] =
"chrome://internet-detail-dialog/"; "chrome://internet-detail-dialog/";
const char kChromeUIInternetConfigDialogHost[] = "internet-config-dialog"; const char kChromeUIInternetConfigDialogHost[] = "internet-config-dialog";
const char kChromeUIInternetDetailDialogHost[] = "internet-detail-dialog"; const char kChromeUIInternetDetailDialogHost[] = "internet-detail-dialog";
const char kChromeUILinuxCreditsHost[] = "linux-credits"; const char kChromeUICrostiniCreditsHost[] = "crostini-credits";
const char kChromeUILinuxCreditsURL[] = "chrome://linux-credits/"; const char kChromeUICrostiniCreditsURL[] = "chrome://crostini-credits/";
const char kChromeUIMachineLearningInternalsHost[] = const char kChromeUIMachineLearningInternalsHost[] =
"machine-learning-internals"; "machine-learning-internals";
const char kChromeUIMobileSetupHost[] = "mobilesetup"; const char kChromeUIMobileSetupHost[] = "mobilesetup";
...@@ -290,13 +290,13 @@ bool IsSystemWebUIHost(base::StringPiece host) { ...@@ -290,13 +290,13 @@ bool IsSystemWebUIHost(base::StringPiece host) {
kChromeUIBluetoothPairingHost, kChromeUIBluetoothPairingHost,
kChromeUICellularSetupHost, kChromeUICellularSetupHost,
kChromeUICertificateManagerHost, kChromeUICertificateManagerHost,
kChromeUICrostiniCreditsHost,
kChromeUICrostiniInstallerHost, kChromeUICrostiniInstallerHost,
kChromeUICryptohomeHost, kChromeUICryptohomeHost,
kChromeUIDeviceEmulatorHost, kChromeUIDeviceEmulatorHost,
kChromeUIFirstRunHost, kChromeUIFirstRunHost,
kChromeUIInternetConfigDialogHost, kChromeUIInternetConfigDialogHost,
kChromeUIInternetDetailDialogHost, kChromeUIInternetDetailDialogHost,
kChromeUILinuxCreditsHost,
kChromeUIMobileSetupHost, kChromeUIMobileSetupHost,
kChromeUIMultiDeviceSetupHost, kChromeUIMultiDeviceSetupHost,
kChromeUINetworkHost, kChromeUINetworkHost,
...@@ -594,10 +594,10 @@ const char* const kChromeHostURLs[] = { ...@@ -594,10 +594,10 @@ const char* const kChromeHostURLs[] = {
#endif #endif
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
kChromeUICertificateManagerHost, kChromeUICertificateManagerHost,
kChromeUICrostiniCreditsHost,
kChromeUICryptohomeHost, kChromeUICryptohomeHost,
kChromeUIDriveInternalsHost, kChromeUIDriveInternalsHost,
kChromeUIFirstRunHost, kChromeUIFirstRunHost,
kChromeUILinuxCreditsHost,
kChromeUIMachineLearningInternalsHost, kChromeUIMachineLearningInternalsHost,
kChromeUINetworkHost, kChromeUINetworkHost,
kChromeUIOobeHost, kChromeUIOobeHost,
......
...@@ -228,8 +228,8 @@ extern const char kChromeUIIntenetConfigDialogURL[]; ...@@ -228,8 +228,8 @@ extern const char kChromeUIIntenetConfigDialogURL[];
extern const char kChromeUIIntenetDetailDialogURL[]; extern const char kChromeUIIntenetDetailDialogURL[];
extern const char kChromeUIInternetConfigDialogHost[]; extern const char kChromeUIInternetConfigDialogHost[];
extern const char kChromeUIInternetDetailDialogHost[]; extern const char kChromeUIInternetDetailDialogHost[];
extern const char kChromeUILinuxCreditsHost[]; extern const char kChromeUICrostiniCreditsHost[];
extern const char kChromeUILinuxCreditsURL[]; extern const char kChromeUICrostiniCreditsURL[];
extern const char kChromeUIMachineLearningInternalsHost[]; extern const char kChromeUIMachineLearningInternalsHost[];
extern const char kChromeUIMobileSetupHost[]; extern const char kChromeUIMobileSetupHost[];
extern const char kChromeUIMobileSetupURL[]; extern const char kChromeUIMobileSetupURL[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment