Auto-size the views version of the options dialog.

chrome/browser/views/options/advanced_contents_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/advanced_contents_view.h"
 
 #include <windows.h>
 
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
@@ skipping 269 matching lines @@
 
   SkColor title_color = gfx::NativeTheme::instance()->GetThemeColorWithDefault(
       gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR,
       COLOR_WINDOWTEXT);
   title_label_->SetColor(title_color);
 }
 
 void AdvancedSection::DidChangeBounds(const gfx::Rect& previous,
                                       const gfx::Rect& current) {
   Layout();
-  contents_->Layout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AdvancedSection, protected:
 
 void AdvancedSection::AddWrappingColumnSet(views::GridLayout* layout, int id) {
   ColumnSet* column_set = layout->AddColumnSet(id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 }
@@ skipping 126 matching lines @@
  public:
   explicit PrivacySection(Profile* profile);
   virtual ~PrivacySection() {}
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
   // Overridden from views::LinkController:
   virtual void LinkActivated(views::Link* source, int event_flags);
 
-  // Overridden from views::View:
-  virtual void Layout();
-
  protected:
   // OptionsPageView overrides:
   virtual void InitControlLayout();
   virtual void NotifyPrefChanged(const std::wstring* pref_name);
 
  private:
   // Controls for this section:
   views::NativeButton* content_settings_button_;
   views::NativeButton* clear_data_button_;
   views::Label* section_description_label_;
@@ skipping 92 matching lines @@
 void PrivacySection::LinkActivated(views::Link* source, int event_flags) {
   if (source == learn_more_link_) {
     // We open a new browser window so the Options dialog doesn't get lost
     // behind other windows.
     Browser* browser = Browser::Create(profile());
     browser->OpenURL(GURL(l10n_util::GetString(IDS_LEARN_MORE_PRIVACY_URL)),
                      GURL(), NEW_WINDOW, PageTransition::LINK);
   }
 }
 
-void PrivacySection::Layout() {
-  if (reporting_enabled_checkbox_) {
-    // We override this to try and set the width of the enable logging checkbox
-    // to the width of the parent less some fudging since the checkbox's
-    // preferred size calculation code is dependent on its width, and if we
-    // don't do this then it will return 0 as a preferred width when GridLayout
-    // (called from View::Layout) tries to access it.
-    views::View* parent = GetParent();
-    if (parent && parent->width()) {
-      const int parent_width = parent->width();
-      reporting_enabled_checkbox_->SetBounds(0, 0, parent_width - 20, 0);
-    }
-  }
-  View::Layout();
-}
-
 void PrivacySection::InitControlLayout() {
   AdvancedSection::InitControlLayout();
 
   content_settings_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON));
   clear_data_button_ =  new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON));
   section_description_label_ = new views::Label(
     l10n_util::GetString(IDS_OPTIONS_DISABLE_SERVICES));
   enable_link_doctor_checkbox_ = new views::Checkbox(
@@ skipping 51 matching lines @@
                          indented_view_set_id, true);
   // DNS pre-fetching.
   AddWrappingCheckboxRow(layout, enable_dns_prefetching_checkbox_,
                          indented_view_set_id, true);
   // Safe browsing controls.
   AddWrappingCheckboxRow(layout, enable_safe_browsing_checkbox_,
                          indented_view_set_id,
                          reporting_enabled_checkbox_ != NULL);
   // The "Help make Google Chrome better" checkbox.
   if (reporting_enabled_checkbox_) {
-    AddLeadingControl(layout, reporting_enabled_checkbox_, indented_view_set_id,
-                      false);
+    AddWrappingCheckboxRow(layout, reporting_enabled_checkbox_,
+                           indented_view_set_id, false);
   }
 
   // Init member prefs so we can update the controls if prefs change.
   alternate_error_pages_.Init(prefs::kAlternateErrorPagesEnabled,
                               profile()->GetPrefs(), this);
   use_suggest_.Init(prefs::kSearchSuggestEnabled,
                     profile()->GetPrefs(), this);
   dns_prefetch_enabled_.Init(prefs::kDnsPrefetchingEnabled,
                              profile()->GetPrefs(), this);
   safe_browsing_.Init(prefs::kSafeBrowsingEnabled, profile()->GetPrefs(), this);
@@ skipping 763 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // AdvancedScrollViewContainer, views::View overrides:
 
 void AdvancedScrollViewContainer::Layout() {
   gfx::Rect lb = GetLocalBounds(false);
 
   gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
       gfx::NativeTheme::LIST);
   lb.Inset(border.width(), border.height());
   scroll_view_->SetBounds(lb);
-  scroll_view_->Layout();
 }