Apply View::set_preferred_size in some more places.

chrome/browser/ui/views/arc_app_dialog_view.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/arc/arc_app_dialog.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_util.h"
@@ skipping 21 matching lines @@
 namespace {
 
 const int kRightColumnWidth = 210;
 const int kIconSize = 64;
 // Currenty ARC apps only support 48*48 native icon.
 const int kIconSourceSize = 48;
 
 using ArcAppConfirmCallback =
     base::Callback<void(const std::string& app_id, Profile* profile)>;
 
-// Helper class to hold a smaller icon in a fixed-size view.
-class FixedBoundarySizeImageView : public views::ImageView {
- public:
-  FixedBoundarySizeImageView() {}
-  ~FixedBoundarySizeImageView() override {}
-  // Overriden from View:
-  gfx::Size GetPreferredSize() const override {
-    return gfx::Size(kIconSize, kIconSize);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(FixedBoundarySizeImageView);
-};
-
 class ArcAppDialogView : public views::DialogDelegateView,
                          public AppIconLoaderDelegate {
  public:
   ArcAppDialogView(Profile* profile,
                    AppListControllerDelegate* controller,
                    const std::string& app_id,
                    const base::string16& window_title,
                    const base::string16& heading_text,
                    const base::string16& subheading_text,
                    const base::string16& confirm_button_text,
@@ skipping 74 matching lines @@
   ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
 
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal,
       provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN),
       provider->GetDistanceMetric(
           DISTANCE_PANEL_CONTENT_MARGIN),
       provider->GetDistanceMetric(
           views::DISTANCE_RELATED_CONTROL_HORIZONTAL)));
 
-  icon_view_ = new FixedBoundarySizeImageView();
+  icon_view_ = new views::ImageView();
+  icon_view_->set_preferred_size(gfx::Size(kIconSize, kIconSize));
   AddChildView(icon_view_);
 
   views::View* text_container = new views::View();
   views::BoxLayout* text_container_layout =
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
   text_container_layout->set_main_axis_alignment(
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
   text_container_layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   text_container->SetLayoutManager(text_container_layout);
@@ skipping 133 matching lines @@
 
 bool CloseAppDialogViewAndConfirmForTest(bool confirm) {
   if (!g_current_arc_app_dialog_view)
     return false;
 
   g_current_arc_app_dialog_view->ConfirmOrCancelForTest(confirm);
   return true;
 }
 
 }  // namespace arc