| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/views/options/general_page_view.h" | 5 #include "chrome/browser/views/options/general_page_view.h" |
| 6 | 6 |
| 7 #include "base/gfx/png_decoder.h" | 7 #include "base/gfx/png_decoder.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/thread.h" | 10 #include "base/thread.h" |
| (...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 882 GridLayout* layout = new GridLayout(contents); | 882 GridLayout* layout = new GridLayout(contents); |
| 883 contents->SetLayoutManager(layout); | 883 contents->SetLayoutManager(layout); |
| 884 | 884 |
| 885 const int single_column_view_set_id = 0; | 885 const int single_column_view_set_id = 0; |
| 886 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id); | 886 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id); |
| 887 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1, | 887 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1, |
| 888 GridLayout::USE_PREF, 0, 0); | 888 GridLayout::USE_PREF, 0, 0); |
| 889 | 889 |
| 890 const int double_column_view_set_id = 1; | 890 const int double_column_view_set_id = 1; |
| 891 column_set = layout->AddColumnSet(double_column_view_set_id); | 891 column_set = layout->AddColumnSet(double_column_view_set_id); |
| 892 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0, | 892 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0, |
| 893 GridLayout::USE_PREF, 0, 0); | 893 GridLayout::USE_PREF, 0, 0); |
| 894 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | 894 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); |
| 895 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 895 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
| 896 GridLayout::USE_PREF, 0, 0); | 896 GridLayout::USE_PREF, 0, 0); |
| 897 | 897 |
| 898 layout->StartRow(0, single_column_view_set_id); | 898 layout->StartRow(0, single_column_view_set_id); |
| 899 layout->AddView(homepage_use_newtab_radio_); | 899 layout->AddView(homepage_use_newtab_radio_); |
| 900 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 900 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
| 901 layout->StartRow(0, double_column_view_set_id); | 901 layout->StartRow(0, double_column_view_set_id); |
| 902 layout->AddView(homepage_use_url_radio_); | 902 layout->AddView(homepage_use_url_radio_); |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1078 homepage_use_url_textfield_->SetEnabled(false); | 1078 homepage_use_url_textfield_->SetEnabled(false); |
| 1079 homepage_use_url_textfield_->SetReadOnly(true); | 1079 homepage_use_url_textfield_->SetReadOnly(true); |
| 1080 } | 1080 } |
| 1081 } | 1081 } |
| 1082 | 1082 |
| 1083 void GeneralPageView::SetDefaultSearchProvider() { | 1083 void GeneralPageView::SetDefaultSearchProvider() { |
| 1084 const int index = default_search_engine_combobox_->GetSelectedItem(); | 1084 const int index = default_search_engine_combobox_->GetSelectedItem(); |
| 1085 default_search_engines_model_->model()->SetDefaultSearchProvider( | 1085 default_search_engines_model_->model()->SetDefaultSearchProvider( |
| 1086 default_search_engines_model_->GetTemplateURLAt(index)); | 1086 default_search_engines_model_->GetTemplateURLAt(index)); |
| 1087 } | 1087 } |
| OLD | NEW |