Add images to the PluginVm launcher dialog

Adds images to the PluginVm launcher dialog:
* Add logo image
* Add FPO image
* Add error image

Renames a few of the images so the naming is consistent.
Also replaces title with a big message label as logo image is supposed to be above it.
Proper layout would be added in further CLs.

Test: browser_tests --gtest_filter="PluginVm*"
Bug: 931700
Change-Id: I6fb5e60909a6da50913d5cca96b725a4351748a1
Reviewed-on: https://chromium-review.googlesource.com/c/1477690Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Timothy Loh <timloh@chromium.org>
Commit-Queue: Olya Kalitova <okalitova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635460}

chrome/app/theme/chrome_unscaled_resources.grd

@@ -131,7 +131,10 @@
         <include name="IDR_CROSTINI_MASCOT" file="crostini/crostini_mascot_1x.svg" type="BINDATA" />
         <include name="IDR_LINUX_ILLUSTRATION" file="crostini/linux_illustration_2x.png" type="BINDATA" />
         <!-- PluginVm icons -->
-        <include name="IDR_LOGO_PLUGIN_VM_LAUNCHER" file="plugin_vm/logo_plugin_vm_launcher.png" type="BINDATA" />
+        <include name="IDR_LOGO_PLUGIN_VM_DEFAULT_32" file="plugin_vm/logo_plugin_vm_default_32.png" type="BINDATA" />
+        <include name="IDR_LOGO_PLUGIN_VM_DEFAULT_192" file="plugin_vm/logo_plugin_vm_default_192.png" type="BINDATA" />
+        <include name="IDR_PLUGIN_VM_LAUNCHER" file="plugin_vm/plugin_vm_launcher.png" type="BINDATA" />
+        <include name="IDR_PLUGIN_VM_LAUNCHER_ERROR" file="plugin_vm/plugin_vm_launcher_error.png" type="BINDATA" />
       </if>
     </includes>
   </release>

chrome/browser/ui/app_list/plugin_vm/plugin_vm_app_model_builder.cc

@@ -28,5 +28,5 @@ void PluginVmAppModelBuilder::BuildModel() {
       profile(), model_updater(), GetSyncItem(*kPluginVmTerminalId),
       *kPluginVmTerminalId, kPluginVmTerminalAppName,
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          IDR_LOGO_PLUGIN_VM_LAUNCHER)));
+          IDR_LOGO_PLUGIN_VM_DEFAULT_192)));
 }

chrome/browser/ui/views/plugin_vm/plugin_vm_launcher_view.cc

@@ -11,6 +11,7 @@
 #include "chrome/browser/chromeos/plugin_vm/plugin_vm_image_manager_factory.h"
 #include "chrome/browser/chromeos/plugin_vm/plugin_vm_util.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
+#include "chrome/grit/chrome_unscaled_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -18,6 +19,7 @@
 #include "ui/chromeos/devicetype_utils.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/progress_bar.h"
 #include "ui/views/layout/box_layout.h"
@@ -40,11 +42,27 @@ void plugin_vm::ShowPluginVmLauncherView(Profile* profile) {
 PluginVmLauncherView::PluginVmLauncherView(Profile* profile)
     : plugin_vm_image_manager_(
           plugin_vm::PluginVmImageManagerFactory::GetForProfile(profile)) {
+  constexpr gfx::Size kLogoImageSize(32, 32);
+
   const ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::kVertical,
       provider->GetInsetsMetric(views::InsetsMetric::INSETS_DIALOG)));
 
+  views::ImageView* logo_image = new views::ImageView();
+  logo_image->SetImageSize(kLogoImageSize);
+  logo_image->SetImage(
+      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_LOGO_PLUGIN_VM_DEFAULT_32));
+  logo_image->SetHorizontalAlignment(views::ImageView::LEADING);
+  AddChildView(logo_image);
+
+  big_message_label_ =
+      new views::Label(GetBigMessage(), views::style::CONTEXT_DIALOG_TITLE);
+  big_message_label_->SetMultiLine(true);
+  big_message_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  AddChildView(big_message_label_);
+
   message_label_ = new views::Label();
   message_label_->SetMultiLine(true);
   message_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ -53,6 +71,13 @@ PluginVmLauncherView::PluginVmLauncherView(Profile* profile)
   progress_bar_ = new views::ProgressBar();
   progress_bar_->SetVisible(false);
   AddChildView(progress_bar_);
+
+  big_image_ = new views::ImageView();
+  big_image_->SetImage(
+      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_PLUGIN_VM_LAUNCHER));
+  big_image_->SetHorizontalAlignment(views::ImageView::CENTER);
+  AddChildView(big_image_);
 }
 
 int PluginVmLauncherView::GetDialogButtons() const {
@@ -89,18 +114,8 @@ base::string16 PluginVmLauncherView::GetDialogButtonLabel(
   }
 }
 
-base::string16 PluginVmLauncherView::GetWindowTitle() const {
-  switch (state_) {
-    case State::START_DOWNLOADING:
-    case State::DOWNLOADING:
-    case State::UNZIPPING:
-      return l10n_util::GetStringUTF16(
-          IDS_PLUGIN_VM_LAUNCHER_ENVIRONMENT_SETTING_TITLE);
-    case State::FINISHED:
-      return l10n_util::GetStringUTF16(IDS_PLUGIN_VM_LAUNCHER_FINISHED_TITLE);
-    case State::ERROR:
-      return l10n_util::GetStringUTF16(IDS_PLUGIN_VM_LAUNCHER_ERROR_TITLE);
-  }
+bool PluginVmLauncherView::ShouldShowWindowTitle() const {
+  return false;
 }
 
 bool PluginVmLauncherView::Accept() {
@@ -126,7 +141,7 @@ bool PluginVmLauncherView::Cancel() {
 
 gfx::Size PluginVmLauncherView::CalculatePreferredSize() const {
   const int width = ChromeLayoutProvider::Get()->GetDistanceMetric(
-      DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH);
+      DISTANCE_LARGE_MODAL_DIALOG_PREFERRED_WIDTH);
   return gfx::Size(width,
                    GetLayoutManager()->GetPreferredHeightForWidth(this, width));
 }
@@ -178,6 +193,20 @@ PluginVmLauncherView::GetPluginVmImageManagerForTesting() {
   return plugin_vm_image_manager_;
 }
 
+base::string16 PluginVmLauncherView::GetBigMessage() {
+  switch (state_) {
+    case State::START_DOWNLOADING:
+    case State::DOWNLOADING:
+    case State::UNZIPPING:
+      return l10n_util::GetStringUTF16(
+          IDS_PLUGIN_VM_LAUNCHER_ENVIRONMENT_SETTING_TITLE);
+    case State::FINISHED:
+      return l10n_util::GetStringUTF16(IDS_PLUGIN_VM_LAUNCHER_FINISHED_TITLE);
+    case State::ERROR:
+      return l10n_util::GetStringUTF16(IDS_PLUGIN_VM_LAUNCHER_ERROR_TITLE);
+  }
+}
+
 void PluginVmLauncherView::AddedToWidget() {
   StartPluginVmImageDownload();
 }
@@ -198,14 +227,35 @@ base::string16 PluginVmLauncherView::GetMessage() const {
   }
 }
 
-void PluginVmLauncherView::OnStateUpdated() {
-  DialogModelChanged();
-  GetWidget()->UpdateWindowTitle();
+void PluginVmLauncherView::SetBigMessageLabel() {
+  big_message_label_->SetText(GetBigMessage());
+  big_message_label_->SetVisible(true);
+}
 
+void PluginVmLauncherView::SetMessageLabel() {
   base::string16 message = GetMessage();
   const bool message_visible = !message.empty();
   message_label_->SetVisible(message_visible);
   message_label_->SetText(message);
+}
+
+void PluginVmLauncherView::SetBigImage() {
+  if (state_ == State::ERROR) {
+    big_image_->SetImage(
+        ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            IDR_PLUGIN_VM_LAUNCHER_ERROR));
+    return;
+  }
+  big_image_->SetImage(
+      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_PLUGIN_VM_LAUNCHER));
+}
+
+void PluginVmLauncherView::OnStateUpdated() {
+  DialogModelChanged();
+  SetBigMessageLabel();
+  SetMessageLabel();
+  SetBigImage();
 
   const bool progress_bar_visible =
       state_ == State::DOWNLOADING || state_ == State::UNZIPPING;

chrome/browser/ui/views/plugin_vm/plugin_vm_launcher_view.h

@@ -10,6 +10,7 @@
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"
 
 namespace views {
+class ImageView;
 class Label;
 class ProgressBar;
 }  // namespace views
@@ -28,7 +29,7 @@ class PluginVmLauncherView : public views::BubbleDialogDelegateView,
   // views::BubbleDialogDelegateView implementation.
   int GetDialogButtons() const override;
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
-  base::string16 GetWindowTitle() const override;
+  bool ShouldShowWindowTitle() const override;
   bool Accept() override;
   bool Cancel() override;
   gfx::Size CalculatePreferredSize() const override;
@@ -42,7 +43,9 @@ class PluginVmLauncherView : public views::BubbleDialogDelegateView,
   void OnUnzipped() override;
   void OnUnzippingFailed() override;
 
+  // Public for testing purposes.
   plugin_vm::PluginVmImageManager* GetPluginVmImageManagerForTesting();
+  base::string16 GetBigMessage();
 
  protected:
   // views::BubbleDialogDelegateView implementation.
@@ -52,6 +55,9 @@ class PluginVmLauncherView : public views::BubbleDialogDelegateView,
   ~PluginVmLauncherView() override;
 
   base::string16 GetMessage() const;
+  void SetBigMessageLabel();
+  void SetMessageLabel();
+  void SetBigImage();
   void OnStateUpdated();
 
   void StartPluginVmImageDownload();
@@ -65,9 +71,11 @@ class PluginVmLauncherView : public views::BubbleDialogDelegateView,
   };
 
   State state_ = State::START_DOWNLOADING;
+  plugin_vm::PluginVmImageManager* plugin_vm_image_manager_ = nullptr;
+  views::Label* big_message_label_ = nullptr;
   views::Label* message_label_ = nullptr;
   views::ProgressBar* progress_bar_ = nullptr;
-  plugin_vm::PluginVmImageManager* plugin_vm_image_manager_ = nullptr;
+  views::ImageView* big_image_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(PluginVmLauncherView);
 };

chrome/browser/ui/views/plugin_vm/plugin_vm_launcher_view_browsertest.cc

@@ -34,7 +34,7 @@ class PluginVmLauncherViewBrowserTest : public DialogBrowserTest {
   void CheckSetupIsInProgress() {
     EXPECT_TRUE(HasCancelButton());
     EXPECT_FALSE(HasAcceptButton());
-    EXPECT_EQ(view_->GetWindowTitle(),
+    EXPECT_EQ(view_->GetBigMessage(),
               l10n_util::GetStringUTF16(
                   IDS_PLUGIN_VM_LAUNCHER_ENVIRONMENT_SETTING_TITLE));
   }
@@ -44,7 +44,7 @@ class PluginVmLauncherViewBrowserTest : public DialogBrowserTest {
     EXPECT_TRUE(HasCancelButton());
     EXPECT_EQ(view_->GetDialogButtonLabel(ui::DIALOG_BUTTON_OK),
               l10n_util::GetStringUTF16(IDS_PLUGIN_VM_LAUNCHER_RETRY_BUTTON));
-    EXPECT_EQ(view_->GetWindowTitle(),
+    EXPECT_EQ(view_->GetBigMessage(),
               l10n_util::GetStringUTF16(IDS_PLUGIN_VM_LAUNCHER_ERROR_TITLE));
   }
 
@@ -53,7 +53,7 @@ class PluginVmLauncherViewBrowserTest : public DialogBrowserTest {
     EXPECT_FALSE(HasCancelButton());
     EXPECT_EQ(view_->GetDialogButtonLabel(ui::DIALOG_BUTTON_OK),
               l10n_util::GetStringUTF16(IDS_PLUGIN_VM_LAUNCHER_LAUNCH_BUTTON));
-    EXPECT_EQ(view_->GetWindowTitle(),
+    EXPECT_EQ(view_->GetBigMessage(),
               l10n_util::GetStringUTF16(IDS_PLUGIN_VM_LAUNCHER_FINISHED_TITLE));
   }