views: Make CreatePanelGridLayout a static method of GridLayout class.

chrome/browser/ui/views/create_application_shortcut_view.cc

 // Copyright (c) 2011 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 "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
@@ skipping 101 matching lines @@
   if (description_) {
     description_->SetText(text);
   } else {
     description_ = new views::Label(text);
     description_->SetMultiLine(true);
     description_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   }
 }
 
 void AppInfoView::SetupLayout() {
-  views::GridLayout* layout = CreatePanelGridLayout(this);
+  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,
                         kAppIconSize, kAppIconSize);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         80.0f, views::GridLayout::USE_PREF, 0, 0);
 
@@ skipping 123 matching lines @@
         UTF16ToWide(l10n_util::GetStringUTF16(
             IDS_CREATE_SHORTCUTS_QUICK_LAUNCH_BAR_CHKBOX)),
       profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateInQuickLaunchBar));
 #elif defined(OS_LINUX)
   menu_check_box_ = AddCheckbox(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_MENU_CHKBOX)),
       profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateInAppsMenu));
 #endif
 
   // Layout controls
-  views::GridLayout* layout = CreatePanelGridLayout(this);
+  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(5.0f, 10);
@@ skipping 236 matching lines @@
 void CreateChromeApplicationShortcutView::OnImageLoaded(
     SkBitmap* image, ExtensionResource resource, int index) {
   if (image->isNull()) {
     NOTREACHED() << "Corrupt image in profile?";
     return;
   }
   shortcut_info_.favicon = *image;
   static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
 }