Auto-size the views version of the options dialog.

chrome/browser/views/options/general_page_view.cc

 // Copyright (c) 2010 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/views/options/general_page_view.h"
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
@@ skipping 17 matching lines @@
 #include "grit/generated_resources.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/label.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 
 namespace {
 
-const int kStartupRadioGroup = 1;
-const int kHomePageRadioGroup = 2;
+// All the options pages are in the same view hierarchy. This means we need to
+// make sure group identifiers don't collide across different pages.
+const int kStartupRadioGroup = 101;
+const int kHomePageRadioGroup = 102;
 const SkColor kDefaultBrowserLabelColor = SkColorSetRGB(0, 135, 0);
 const SkColor kNotDefaultBrowserLabelColor = SkColorSetRGB(135, 0, 0);
+const int kHomePageTextfieldWidthChars = 40;
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // SearchEngineListModel
 
 class SearchEngineListModel : public ComboboxModel,
                               public TemplateURLModelObserver {
  public:
   explicit SearchEngineListModel(Profile* profile);
@@ skipping 343 matching lines @@
         show_home_button_.GetValue());
   }
 }
 
 void GeneralPageView::HighlightGroup(OptionsGroup highlight_group) {
   if (highlight_group == OPTIONS_GROUP_DEFAULT_SEARCH)
     default_search_group_->SetHighlighted(true);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// GeneralPageView, views::View overrides:
-
-void GeneralPageView::Layout() {
-  // We need to Layout twice - once to get the width of the contents box...
-  View::Layout();
-  startup_last_session_radio_->SetBounds(
-      0, 0, startup_group_->GetContentsWidth(), 0);
-  homepage_use_newtab_radio_->SetBounds(
-      0, 0, homepage_group_->GetContentsWidth(), 0);
-  homepage_show_home_button_checkbox_->SetBounds(
-      0, 0, homepage_group_->GetContentsWidth(), 0);
-  default_browser_status_label_->SetBounds(
-      0, 0, default_browser_group_->GetContentsWidth(), 0);
-  // ... and twice to get the height of multi-line items correct.
-  View::Layout();
-}
-
-///////////////////////////////////////////////////////////////////////////////
 // GeneralPageView, private:
 
 void GeneralPageView::SetDefaultBrowserUIState(
     ShellIntegration::DefaultBrowserUIState state) {
   bool button_enabled = state == ShellIntegration::STATE_NOT_DEFAULT;
   default_browser_use_as_default_button_->SetEnabled(button_enabled);
   default_browser_use_as_default_button_->SetNeedElevation(true);
   if (state == ShellIntegration::STATE_IS_DEFAULT) {
     default_browser_status_label_->SetText(
       l10n_util::GetStringF(IDS_OPTIONS_DEFAULTBROWSER_DEFAULT,
@@ skipping 72 matching lines @@
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(startup_homepage_radio_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
-  layout->AddView(startup_last_session_radio_);
+  layout->AddView(startup_last_session_radio_, 1, 1,
+                  GridLayout::FILL, GridLayout::LEADING);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(startup_custom_radio_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, double_column_view_set_id);
-  layout->AddView(startup_custom_pages_table_);
+  layout->AddView(startup_custom_pages_table_, 1, 1,
+                  GridLayout::FILL, GridLayout::FILL);
 
   views::View* button_stack = new views::View;
   GridLayout* button_stack_layout = new GridLayout(button_stack);
   button_stack->SetLayoutManager(button_stack_layout);
 
   column_set = button_stack_layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
   button_stack_layout->StartRow(0, single_column_view_set_id);
   button_stack_layout->AddView(startup_add_custom_page_button_,
@@ skipping 18 matching lines @@
       l10n_util::GetString(IDS_OPTIONS_HOMEPAGE_USE_NEWTAB),
       kHomePageRadioGroup);
   homepage_use_newtab_radio_->set_listener(this);
   homepage_use_newtab_radio_->SetMultiLine(true);
   homepage_use_url_radio_ = new views::RadioButton(
       l10n_util::GetString(IDS_OPTIONS_HOMEPAGE_USE_URL),
       kHomePageRadioGroup);
   homepage_use_url_radio_->set_listener(this);
   homepage_use_url_textfield_ = new views::Textfield;
   homepage_use_url_textfield_->SetController(this);
+  homepage_use_url_textfield_->set_default_width_in_chars(
+      kHomePageTextfieldWidthChars);
   homepage_show_home_button_checkbox_ = new views::Checkbox(
       l10n_util::GetString(IDS_OPTIONS_HOMEPAGE_SHOW_BUTTON));
   homepage_show_home_button_checkbox_->set_listener(this);
   homepage_show_home_button_checkbox_->SetMultiLine(true);
 
   using views::GridLayout;
   using views::ColumnSet;
 
   views::View* contents = new views::View;
   GridLayout* layout = new GridLayout(contents);
   contents->SetLayoutManager(layout);
 
   const int single_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   const int double_column_view_set_id = 1;
   column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_view_set_id);
-  layout->AddView(homepage_use_newtab_radio_);
+  layout->AddView(homepage_use_newtab_radio_, 1, 1,
+                  GridLayout::FILL, GridLayout::LEADING);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(homepage_use_url_radio_);
   layout->AddView(homepage_use_url_textfield_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
-  layout->AddView(homepage_show_home_button_checkbox_);
+  layout->AddView(homepage_show_home_button_checkbox_, 1, 1,
+                  GridLayout::FILL, GridLayout::LEADING);
 
   homepage_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_OPTIONS_HOMEPAGE_GROUP_NAME),
       std::wstring(), true);
 }
 
 
 void GeneralPageView::InitDefaultSearchGroup() {
   default_search_engines_model_.reset(new SearchEngineListModel(profile()));
   default_search_engine_combobox_ =
@@ skipping 45 matching lines @@
   views::View* contents = new views::View;
   GridLayout* layout = new GridLayout(contents);
   contents->SetLayoutManager(layout);
 
   const int single_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_view_set_id);
-  layout->AddView(default_browser_status_label_);
+  layout->AddView(default_browser_status_label_, 1, 1,
+                  GridLayout::FILL, GridLayout::LEADING);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(default_browser_use_as_default_button_);
 
   default_browser_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME),
       std::wstring(), false);
 
   if (BrowserDistribution::GetDistribution()->CanSetAsDefault())
     default_browser_worker_->StartCheckDefaultBrowser();
@@ skipping 99 matching lines @@
     homepage_use_url_textfield_->SetEnabled(false);
     homepage_use_url_textfield_->SetReadOnly(true);
   }
 }
 
 void GeneralPageView::SetDefaultSearchProvider() {
   const int index = default_search_engine_combobox_->selected_item();
   default_search_engines_model_->model()->SetDefaultSearchProvider(
       default_search_engines_model_->GetTemplateURLAt(index));
 }