views: Make CreatePanelGridLayout a static method of GridLayout class.

chrome/browser/chromeos/login/captcha_view.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/chromeos/login/captcha_view.h"
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/image_downloader.h"
@@ skipping 135 matching lines @@
 
 void CaptchaView::Init() {
   if (is_standalone_) {
     // Use rounded rect background.
     set_border(CreateWizardBorder(&BorderDefinition::kUserBorder));
     views::Painter* painter = CreateWizardPainter(
         &BorderDefinition::kUserBorder);
     set_background(views::Background::CreateBackgroundPainter(true, painter));
   }
 
-  views::GridLayout* layout = CreatePanelGridLayout(this);
+  views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, column_view_set_id);
   Label* label = new views::Label(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_CAPTCHA_INSTRUCTIONS)));
   label->SetMultiLine(true);
@@ skipping 34 matching lines @@
     layout->AddView(ok_button_, 1, 1,
                     views::GridLayout::CENTER, views::GridLayout::CENTER);
   }
 
   // ImageDownloader will delete itself once URL is fetched.
   // TODO(nkostylev): Make sure that it works after view is deleted.
   new ImageDownloader(this, GURL(captcha_url_), std::string());
 }
 
 }  // namespace chromeos