Misc. cleanup for c/b/ui/views/apps/.

Mostly initializing variables in declarations and shortening code.

Also changed AppInfoDialogViewsTest.ViewInStore to call the link
callback instead of pressing the link directly, since in a future CL
I'll be removing the link member variable, so the test wouldn't work.

Bug: none
Change-Id: I90c689be86785a9b297b3161dafb01a0a8bb3568
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1983510
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728452}

chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc

@@ -59,12 +59,10 @@ class AppInfoDialogTestApi {
  public:
   explicit AppInfoDialogTestApi(AppInfoDialog* dialog) : dialog_(dialog) {}
 
-  AppInfoHeaderPanel* header_panel() {
-    return static_cast<AppInfoHeaderPanel*>(dialog_->children().front());
-  }
-
-  views::Link* view_in_store_link() {
-    return header_panel()->view_in_store_link_;
+  void ShowAppInWebStore() {
+    auto* header_panel =
+        static_cast<AppInfoHeaderPanel*>(dialog_->children().front());
+    return header_panel->ShowAppInWebStore();
   }
 
  private:
@@ -264,16 +262,14 @@ TEST_F(AppInfoDialogViewsTest, DestroyedOtherProfileDoesNotCloseDialog) {
 // dialog cleanly.
 TEST_F(AppInfoDialogViewsTest, ViewInStore) {
   ShowAppInfo(kTestExtensionId);
-  EXPECT_TRUE(extension_->from_webstore());  // Otherwise there is no link.
-  views::Link* link = test::AppInfoDialogTestApi(dialog_).view_in_store_link();
-  EXPECT_TRUE(link);
+  ASSERT_TRUE(extension_->from_webstore());
 
   TabStripModel* tabs = browser()->tab_strip_model();
   EXPECT_EQ(0, tabs->count());
 
   ASSERT_TRUE(widget_);
   EXPECT_FALSE(widget_->IsClosed());
-  link->OnKeyPressed(ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_SPACE, 0));
+  test::AppInfoDialogTestApi(dialog_).ShowAppInWebStore();
 
   ASSERT_TRUE(widget_);
   EXPECT_TRUE(widget_->IsClosed());

chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc

@@ -63,6 +63,10 @@ AppInfoHeaderPanel::AppInfoHeaderPanel(Profile* profile,
 AppInfoHeaderPanel::~AppInfoHeaderPanel() {
 }
 
+void AppInfoHeaderPanel::OnIconUpdated(extensions::ChromeAppIcon* icon) {
+  app_icon_view_->SetImage(icon->image_skia());
+}
+
 void AppInfoHeaderPanel::CreateControls() {
   auto app_icon_view = std::make_unique<views::ImageView>();
   app_icon_view->SetImageSize(gfx::Size(kAppIconSize, kAppIconSize));
@@ -88,13 +92,12 @@ void AppInfoHeaderPanel::CreateControls() {
       vertical_info_container_ptr->AddChildView(std::move(app_name_label));
 
   if (CanShowAppInWebStore()) {
-    auto view_in_store_link = std::make_unique<views::Link>(
-        l10n_util::GetStringUTF16(IDS_APPLICATION_INFO_WEB_STORE_LINK));
+    auto* view_in_store_link =
+        vertical_info_container_ptr->AddChildView(std::make_unique<views::Link>(
+            l10n_util::GetStringUTF16(IDS_APPLICATION_INFO_WEB_STORE_LINK)));
     view_in_store_link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     view_in_store_link->set_listener(this);
     view_in_store_link->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
-    view_in_store_link_ = vertical_info_container_ptr->AddChildView(
-        std::move(view_in_store_link));
   } else {
     // If there's no link, allow the app's name to take up multiple lines.
     // TODO(sashab): Limit the number of lines to 2.
@@ -103,14 +106,9 @@ void AppInfoHeaderPanel::CreateControls() {
 }
 
 void AppInfoHeaderPanel::LinkClicked(views::Link* source, int event_flags) {
-  DCHECK_EQ(source, view_in_store_link_);
   ShowAppInWebStore();
 }
 
-void AppInfoHeaderPanel::OnIconUpdated(extensions::ChromeAppIcon* icon) {
-  app_icon_view_->SetImage(icon->image_skia());
-}
-
 void AppInfoHeaderPanel::ShowAppInWebStore() {
   DCHECK(CanShowAppInWebStore());
   Close();

chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.h

@@ -39,14 +39,14 @@ class AppInfoHeaderPanel : public AppInfoPanel,
  private:
   friend class test::AppInfoDialogTestApi;
 
-  void CreateControls();
-
   // Overridden from views::LinkListener:
   void LinkClicked(views::Link* source, int event_flags) override;
 
   // extensions::ChromeAppIconDelegate:
   void OnIconUpdated(extensions::ChromeAppIcon* icon) override;
 
+  void CreateControls();
+
   // Opens the app in the web store. Must only be called if
   // CanShowAppInWebStore() returns true.
   void ShowAppInWebStore();
@@ -54,7 +54,6 @@ class AppInfoHeaderPanel : public AppInfoPanel,
 
   // UI elements on the dialog. Elements are nullptr if they are not displayed.
   views::ImageView* app_icon_view_ = nullptr;
-  views::Link* view_in_store_link_ = nullptr;
 
   std::unique_ptr<extensions::ChromeAppIcon> app_icon_;
 

chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc

@@ -98,11 +98,7 @@ base::string16 LaunchOptionsComboboxModel::GetItemAt(int index) {
 
 AppInfoSummaryPanel::AppInfoSummaryPanel(Profile* profile,
                                          const extensions::Extension* app)
-    : AppInfoPanel(profile, app),
-      size_value_(nullptr),
-      homepage_link_(nullptr),
-      licenses_link_(nullptr),
-      launch_options_combobox_(nullptr) {
+    : AppInfoPanel(profile, app) {
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kVertical, gfx::Insets(),
       ChromeLayoutProvider::Get()->GetDistanceMetric(
@@ -126,10 +122,10 @@ void AppInfoSummaryPanel::AddDescriptionAndLinksControl(
               DISTANCE_RELATED_CONTROL_VERTICAL_SMALL)));
 
   if (!app_->description().empty()) {
-    const size_t max_length = 400;
+    constexpr size_t kMaxLength = 400;
     base::string16 text = base::UTF8ToUTF16(app_->description());
-    if (text.length() > max_length) {
-      text = text.substr(0, max_length);
+    if (text.length() > kMaxLength) {
+      text = text.substr(0, kMaxLength - 5);
       text += base::ASCIIToUTF16(" ... ");
     }
 
@@ -138,25 +134,18 @@ void AppInfoSummaryPanel::AddDescriptionAndLinksControl(
     description_and_labels_stack->AddChildView(std::move(description_label));
   }
 
-  if (CanShowAppHomePage()) {
-    auto homepage_link = std::make_unique<views::Link>(
-        l10n_util::GetStringUTF16(IDS_APPLICATION_INFO_HOMEPAGE_LINK));
-    homepage_link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    homepage_link->set_listener(this);
-    homepage_link->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
-    homepage_link_ =
-        description_and_labels_stack->AddChildView(std::move(homepage_link));
-  }
-
-  if (CanDisplayLicenses()) {
-    auto licenses_link = std::make_unique<views::Link>(
-        l10n_util::GetStringUTF16(IDS_APPLICATION_INFO_LICENSES_BUTTON_TEXT));
-    licenses_link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    licenses_link->set_listener(this);
-    licenses_link->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
-    licenses_link_ =
-        description_and_labels_stack->AddChildView(std::move(licenses_link));
-  }
+  const auto add_link = [&](int message_id) {
+    auto* link = description_and_labels_stack->AddChildView(
+        std::make_unique<views::Link>(l10n_util::GetStringUTF16(message_id)));
+    link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    link->set_listener(this);
+    link->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
+    return link;
+  };
+  if (CanShowAppHomePage())
+    homepage_link_ = add_link(IDS_APPLICATION_INFO_HOMEPAGE_LINK);
+  if (CanDisplayLicenses())
+    licenses_link_ = add_link(IDS_APPLICATION_INFO_LICENSES_BUTTON_TEXT);
 
   vertical_stack->AddChildView(std::move(description_and_labels_stack));
 }
@@ -281,6 +270,7 @@ bool AppInfoSummaryPanel::CanSetLaunchType() const {
   return !app_->is_platform_app() && !app_->is_extension() &&
          app_->id() != extension_misc::kChromeAppId;
 }
+
 void AppInfoSummaryPanel::ShowAppHomePage() {
   DCHECK(CanShowAppHomePage());
   OpenLink(extensions::ManifestURL::GetHomepageURL(app_));

chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h

@@ -26,7 +26,6 @@ class Extension;
 namespace views {
 class Combobox;
 class Label;
-class Link;
 class View;
 }
 
@@ -79,12 +78,12 @@ class AppInfoSummaryPanel : public AppInfoPanel,
   const std::vector<GURL> GetLicenseUrls() const;
 
   // UI elements on the dialog.
-  views::Label* size_value_;
-  views::Link* homepage_link_;
-  views::Link* licenses_link_;
+  views::Label* size_value_ = nullptr;
+  views::View* homepage_link_ = nullptr;
+  views::View* licenses_link_ = nullptr;
 
   std::unique_ptr<LaunchOptionsComboboxModel> launch_options_combobox_model_;
-  views::Combobox* launch_options_combobox_;
+  views::Combobox* launch_options_combobox_ = nullptr;
 
   base::WeakPtrFactory<AppInfoSummaryPanel> weak_ptr_factory_{this};
 

chrome/browser/ui/views/apps/app_info_dialog/arc_app_info_links_panel.cc

@@ -23,9 +23,7 @@
 
 ArcAppInfoLinksPanel::ArcAppInfoLinksPanel(Profile* profile,
                                            const extensions::Extension* app)
-    : AppInfoPanel(profile, app),
-      app_list_observer_(this),
-      manage_link_(nullptr) {
+    : AppInfoPanel(profile, app) {
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kVertical, gfx::Insets(),
       ChromeLayoutProvider::Get()->GetDistanceMetric(
@@ -50,11 +48,9 @@ ArcAppInfoLinksPanel::ArcAppInfoLinksPanel(Profile* profile,
 ArcAppInfoLinksPanel::~ArcAppInfoLinksPanel() {}
 
 void ArcAppInfoLinksPanel::LinkClicked(views::Link* source, int event_flags) {
-  DCHECK_EQ(manage_link_, source);
+  gfx::NativeView native_view = GetWidget()->GetNativeView();
   const int64_t display_id =
-      display::Screen::GetScreen()
-          ->GetDisplayNearestView(source->GetWidget()->GetNativeView())
-          .id();
+      display::Screen::GetScreen()->GetDisplayNearestView(native_view).id();
   if (arc::ShowPackageInfo(
           arc::ArcIntentHelperBridge::kArcIntentHelperPackageName,
           arc::mojom::ShowPackageInfoPage::MANAGE_LINKS, display_id)) {

chrome/browser/ui/views/apps/app_info_dialog/arc_app_info_links_panel.h

@@ -46,8 +46,9 @@ class ArcAppInfoLinksPanel : public AppInfoPanel,
 
   void UpdateLink(bool enabled);
 
-  ScopedObserver<ArcAppListPrefs, ArcAppListPrefs::Observer> app_list_observer_;
-  views::Link* manage_link_;
+  ScopedObserver<ArcAppListPrefs, ArcAppListPrefs::Observer> app_list_observer_{
+      this};
+  views::Link* manage_link_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAppInfoLinksPanel);
 };