Commit a327aa0c authored by Timothy Loh's avatar Timothy Loh Committed by Commit Bot

Rename BigMessage to Title in PluginVmInstallerView

'Title' is a better description than 'BigMessage'

Change-Id: I8d6b4fbab59e1c42116c43d42fe76fa53edd8f8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2324686
Auto-Submit: Timothy Loh <timloh@chromium.org>
Commit-Queue: Jason Lin <lxj@google.com>
Reviewed-by: default avatarJason Lin <lxj@google.com>
Cr-Commit-Position: refs/heads/master@{#792561}
parent e4df6b48
......@@ -114,12 +114,12 @@ PluginVmInstallerView::PluginVmInstallerView(Profile* profile)
logo_image->SetHorizontalAlignment(views::ImageView::Alignment::kLeading);
upper_container_view->AddChildView(logo_image);
big_message_label_ = new views::Label(GetBigMessage(), {kTitleFont});
big_message_label_->SetProperty(
title_label_ = new views::Label(GetTitle(), {kTitleFont});
title_label_->SetProperty(
views::kMarginsKey, gfx::Insets(kTitleHeight - kTitleFontSize, 0, 0, 0));
big_message_label_->SetMultiLine(false);
big_message_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
upper_container_view->AddChildView(big_message_label_);
title_label_->SetMultiLine(false);
title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
upper_container_view->AddChildView(title_label_);
views::View* message_container_view = new views::View();
message_container_view->SetLayoutManager(std::make_unique<views::BoxLayout>(
......@@ -289,7 +289,7 @@ void PluginVmInstallerView::OnCancelFinished() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
}
base::string16 PluginVmInstallerView::GetBigMessage() const {
base::string16 PluginVmInstallerView::GetTitle() const {
switch (state_) {
case State::kConfirmInstall:
return l10n_util::GetStringFUTF16(
......@@ -484,7 +484,7 @@ void PluginVmInstallerView::AddedToWidget() {
}
void PluginVmInstallerView::OnStateUpdated() {
SetBigMessageLabel();
SetTitleLabel();
SetMessageLabel();
SetBigImage();
......@@ -538,11 +538,10 @@ base::string16 PluginVmInstallerView::GetDownloadProgressMessage(
}
}
void PluginVmInstallerView::SetBigMessageLabel() {
big_message_label_->SetText(GetBigMessage());
big_message_label_->SetVisible(true);
big_message_label_->NotifyAccessibilityEvent(ax::mojom::Event::kTextChanged,
true);
void PluginVmInstallerView::SetTitleLabel() {
title_label_->SetText(GetTitle());
title_label_->SetVisible(true);
title_label_->NotifyAccessibilityEvent(ax::mojom::Event::kTextChanged, true);
}
void PluginVmInstallerView::SetMessageLabel() {
......
......@@ -48,7 +48,7 @@ class PluginVmInstallerView : public views::BubbleDialogDelegateView,
void OnCancelFinished() override;
// Public for testing purposes.
base::string16 GetBigMessage() const;
base::string16 GetTitle() const;
base::string16 GetMessage() const;
void SetFinishedCallbackForTesting(
......@@ -77,7 +77,7 @@ class PluginVmInstallerView : public views::BubbleDialogDelegateView,
base::string16 GetDownloadProgressMessage(uint64_t downlaoded_bytes,
int64_t content_length) const;
void SetBigMessageLabel();
void SetTitleLabel();
void SetMessageLabel();
void SetBigImage();
......@@ -86,7 +86,7 @@ class PluginVmInstallerView : public views::BubbleDialogDelegateView,
Profile* profile_ = nullptr;
base::string16 app_name_;
plugin_vm::PluginVmInstaller* plugin_vm_installer_ = nullptr;
views::Label* big_message_label_ = nullptr;
views::Label* title_label_ = nullptr;
views::Label* message_label_ = nullptr;
views::ProgressBar* progress_bar_ = nullptr;
views::Label* download_progress_message_label_ = nullptr;
......
......@@ -119,7 +119,7 @@ class PluginVmInstallerViewBrowserTest : public DialogBrowserTest {
EXPECT_TRUE(HasCancelButton());
EXPECT_EQ(view_->GetDialogButtonLabel(ui::DIALOG_BUTTON_OK),
l10n_util::GetStringUTF16(IDS_PLUGIN_VM_INSTALLER_RETRY_BUTTON));
EXPECT_EQ(view_->GetBigMessage(),
EXPECT_EQ(view_->GetTitle(),
l10n_util::GetStringUTF16(IDS_PLUGIN_VM_INSTALLER_ERROR_TITLE));
}
......@@ -130,9 +130,8 @@ class PluginVmInstallerViewBrowserTest : public DialogBrowserTest {
l10n_util::GetStringUTF16(IDS_APP_CLOSE));
EXPECT_EQ(view_->GetDialogButtonLabel(ui::DIALOG_BUTTON_OK),
l10n_util::GetStringUTF16(IDS_PLUGIN_VM_INSTALLER_LAUNCH_BUTTON));
EXPECT_EQ(
view_->GetBigMessage(),
l10n_util::GetStringUTF16(IDS_PLUGIN_VM_INSTALLER_FINISHED_TITLE));
EXPECT_EQ(view_->GetTitle(), l10n_util::GetStringUTF16(
IDS_PLUGIN_VM_INSTALLER_FINISHED_TITLE));
}
chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
......@@ -280,7 +279,7 @@ IN_PROC_BROWSER_TEST_F(
base::string16 app_name = l10n_util::GetStringUTF16(IDS_PLUGIN_VM_APP_NAME);
EXPECT_FALSE(HasAcceptButton());
EXPECT_TRUE(HasCancelButton());
EXPECT_EQ(view_->GetBigMessage(),
EXPECT_EQ(view_->GetTitle(),
l10n_util::GetStringFUTF16(
IDS_PLUGIN_VM_INSTALLER_NOT_ALLOWED_TITLE, app_name));
EXPECT_EQ(
......
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