views: fold layout_utils::CreatePanelLayout into GridLayout::CreatePanel

chrome/browser/ui/views/create_application_shortcut_view.cc

 // Copyright (c) 2012 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/views/create_application_shortcut_view.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <cmath>
 #include <utility>
@@ skipping 125 matching lines @@
     description_->SetText(text);
   } else {
     description_ = new views::Label(text);
     description_->SetMultiLine(true);
     description_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   }
 }
 
 void AppInfoView::SetupLayout() {
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
-  SetLayoutManager(layout);
 
   static const int kColumnSetId = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(kColumnSetId);
   column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
                         20.0f, views::GridLayout::FIXED,
                         kIconPreviewSizePixels, kIconPreviewSizePixels);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         80.0f, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, kColumnSetId);
@@ skipping 117 matching lines @@
         profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateInQuickLaunchBar));
   }
 #elif defined(OS_POSIX)
   menu_check_box_ = AddCheckbox(
       l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_MENU_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateInAppsMenu));
 #endif
 
   // Layout controls
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
-  SetLayoutManager(layout);
 
   static const int kHeaderColumnSetId = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(kHeaderColumnSetId);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         100.0f, views::GridLayout::FIXED, 0, 0);
 
   static const int kTableColumnSetId = 1;
   column_set = layout->AddColumnSet(kTableColumnSetId);
   column_set->AddPaddingColumn(0, views::kCheckboxIndent);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
@@ skipping 242 matching lines @@
 bool CreateChromeApplicationShortcutView::Cancel() {
   if (!close_callback_.is_null())
     close_callback_.Run(false);
   return CreateApplicationShortcutView::Cancel();
 }
 
 void CreateChromeApplicationShortcutView::OnAppInfoLoaded(
     std::unique_ptr<web_app::ShortcutInfo> shortcut_info) {
   shortcut_info_ = std::move(shortcut_info);
 }