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
DISALLOW_COPY_AND_ASSIGN(ChromeOSCreditsHandler);
};
class LinuxCreditsHandler
: public base::RefCountedThreadSafe<LinuxCreditsHandler> {
class CrostiniCreditsHandler
: public base::RefCountedThreadSafe<CrostiniCreditsHandler> {
public:
static void Start(const std::string& path,
content::URLDataSource::GotDataCallback callback) {
scoped_refptr<LinuxCreditsHandler> handler(
new LinuxCreditsHandler(path, std::move(callback)));
scoped_refptr<CrostiniCreditsHandler> handler(
new CrostiniCreditsHandler(path, std::move(callback)));
handler->StartOnUIThread();
}
private:
friend class base::RefCountedThreadSafe<LinuxCreditsHandler>;
friend class base::RefCountedThreadSafe<CrostiniCreditsHandler>;
LinuxCreditsHandler(const std::string& path,
content::URLDataSource::GotDataCallback callback)
CrostiniCreditsHandler(const std::string& path,
content::URLDataSource::GotDataCallback callback)
: path_(path), callback_(std::move(callback)) {}
virtual ~LinuxCreditsHandler() {}
virtual ~CrostiniCreditsHandler() {}
void StartOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
......@@ -461,11 +461,11 @@ class LinuxCreditsHandler
base::PostTaskAndReply(
FROM_HERE,
{base::ThreadPool(), base::MayBlock(), base::TaskPriority::BEST_EFFORT},
base::Bind(&LinuxCreditsHandler::LoadLinuxCreditsFileAsync, this),
base::Bind(&LinuxCreditsHandler::ResponseOnUIThread, this));
base::Bind(&CrostiniCreditsHandler::LoadCrostiniCreditsFileAsync, this),
base::Bind(&CrostiniCreditsHandler::ResponseOnUIThread, this));
}
void LoadLinuxCreditsFileAsync() {
void LoadCrostiniCreditsFileAsync() {
base::FilePath credits_file_path(chrome::kLinuxCreditsPath);
if (!base::ReadFileToString(credits_file_path, &contents_)) {
// File with credits not found, ResponseOnUIThread will load credits
......@@ -496,7 +496,7 @@ class LinuxCreditsHandler
// Linux credits contents that was loaded from file.
std::string contents_;
DISALLOW_COPY_AND_ASSIGN(LinuxCreditsHandler);
DISALLOW_COPY_AND_ASSIGN(CrostiniCreditsHandler);
};
#endif
......@@ -625,8 +625,8 @@ void AboutUIHTMLSource::StartDataRequest(
} else if (source_name_ == chrome::kChromeUIOSCreditsHost) {
ChromeOSCreditsHandler::Start(path, std::move(callback));
return;
} else if (source_name_ == chrome::kChromeUILinuxCreditsHost) {
LinuxCreditsHandler::Start(path, std::move(callback));
} else if (source_name_ == chrome::kChromeUICrostiniCreditsHost) {
CrostiniCreditsHandler::Start(path, std::move(callback));
return;
#endif
#if !defined(OS_ANDROID)
......@@ -665,7 +665,7 @@ std::string AboutUIHTMLSource::GetMimeType(const std::string& path) {
bool AboutUIHTMLSource::ShouldAddContentSecurityPolicy() {
#if defined(OS_CHROMEOS)
if (source_name_ == chrome::kChromeUIOSCreditsHost ||
source_name_ == chrome::kChromeUILinuxCreditsHost) {
source_name_ == chrome::kChromeUICrostiniCreditsHost) {
return false;
}
#endif
......
......@@ -342,7 +342,7 @@ bool IsAboutUI(const GURL& url) {
#endif
#if defined(OS_CHROMEOS)
|| url.host_piece() == chrome::kChromeUIOSCreditsHost ||
url.host_piece() == chrome::kChromeUILinuxCreditsHost
url.host_piece() == chrome::kChromeUICrostiniCreditsHost
#endif
); // NOLINT
}
......
......@@ -351,7 +351,7 @@ AboutHandler* AboutHandler::Create(content::WebUIDataSource* html_source,
base::string16 os_with_linux_license = l10n_util::GetStringFUTF16(
IDS_ABOUT_CROS_WITH_LINUX_VERSION_LICENSE,
base::ASCIIToUTF16(chrome::kChromeUIOSCreditsURL),
base::ASCIIToUTF16(chrome::kChromeUILinuxCreditsURL));
base::ASCIIToUTF16(chrome::kChromeUICrostiniCreditsURL));
html_source->AddString("aboutProductOsWithLinuxLicense",
os_with_linux_license);
html_source->AddBoolean("aboutEnterpriseManaged", IsEnterpriseManaged());
......
......@@ -237,8 +237,8 @@ const char kChromeUIIntenetDetailDialogURL[] =
"chrome://internet-detail-dialog/";
const char kChromeUIInternetConfigDialogHost[] = "internet-config-dialog";
const char kChromeUIInternetDetailDialogHost[] = "internet-detail-dialog";
const char kChromeUILinuxCreditsHost[] = "linux-credits";
const char kChromeUILinuxCreditsURL[] = "chrome://linux-credits/";
const char kChromeUICrostiniCreditsHost[] = "crostini-credits";
const char kChromeUICrostiniCreditsURL[] = "chrome://crostini-credits/";
const char kChromeUIMachineLearningInternalsHost[] =
"machine-learning-internals";
const char kChromeUIMobileSetupHost[] = "mobilesetup";
......@@ -290,13 +290,13 @@ bool IsSystemWebUIHost(base::StringPiece host) {
kChromeUIBluetoothPairingHost,
kChromeUICellularSetupHost,
kChromeUICertificateManagerHost,
kChromeUICrostiniCreditsHost,
kChromeUICrostiniInstallerHost,
kChromeUICryptohomeHost,
kChromeUIDeviceEmulatorHost,
kChromeUIFirstRunHost,
kChromeUIInternetConfigDialogHost,
kChromeUIInternetDetailDialogHost,
kChromeUILinuxCreditsHost,
kChromeUIMobileSetupHost,
kChromeUIMultiDeviceSetupHost,
kChromeUINetworkHost,
......@@ -594,10 +594,10 @@ const char* const kChromeHostURLs[] = {
#endif
#if defined(OS_CHROMEOS)
kChromeUICertificateManagerHost,
kChromeUICrostiniCreditsHost,
kChromeUICryptohomeHost,
kChromeUIDriveInternalsHost,
kChromeUIFirstRunHost,
kChromeUILinuxCreditsHost,
kChromeUIMachineLearningInternalsHost,
kChromeUINetworkHost,
kChromeUIOobeHost,
......
......@@ -228,8 +228,8 @@ extern const char kChromeUIIntenetConfigDialogURL[];
extern const char kChromeUIIntenetDetailDialogURL[];
extern const char kChromeUIInternetConfigDialogHost[];
extern const char kChromeUIInternetDetailDialogHost[];
extern const char kChromeUILinuxCreditsHost[];
extern const char kChromeUILinuxCreditsURL[];
extern const char kChromeUICrostiniCreditsHost[];
extern const char kChromeUICrostiniCreditsURL[];
extern const char kChromeUIMachineLearningInternalsHost[];
extern const char kChromeUIMobileSetupHost[];
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