| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/views/options/fonts_page_view.h" | 5 #include "chrome/browser/ui/views/options/fonts_page_view.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <shlobj.h> | 8 #include <shlobj.h> |
| 9 #include <vsstyle.h> | 9 #include <vsstyle.h> |
| 10 #include <vssym32.h> | 10 #include <vssym32.h> |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 } | 250 } |
| 251 // Set Encoding. | 251 // Set Encoding. |
| 252 if (default_encoding_changed_) | 252 if (default_encoding_changed_) |
| 253 default_encoding_.SetValue(default_encoding_selected_); | 253 default_encoding_.SetValue(default_encoding_selected_); |
| 254 } | 254 } |
| 255 | 255 |
| 256 void FontsPageView::InitControlLayout() { | 256 void FontsPageView::InitControlLayout() { |
| 257 using views::GridLayout; | 257 using views::GridLayout; |
| 258 using views::ColumnSet; | 258 using views::ColumnSet; |
| 259 | 259 |
| 260 GridLayout* layout = CreatePanelGridLayout(this); | 260 GridLayout* layout = GridLayout::CreatePanel(this); |
| 261 SetLayoutManager(layout); | 261 SetLayoutManager(layout); |
| 262 | 262 |
| 263 const int single_column_view_set_id = 0; | 263 const int single_column_view_set_id = 0; |
| 264 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id); | 264 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id); |
| 265 | 265 |
| 266 // Fonts group. | 266 // Fonts group. |
| 267 column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 1, | 267 column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 1, |
| 268 GridLayout::USE_PREF, 0, 0); | 268 GridLayout::USE_PREF, 0, 0); |
| 269 fonts_group_title_ = new views::Label( | 269 fonts_group_title_ = new views::Label( |
| 270 UTF16ToWide(l10n_util::GetStringUTF16( | 270 UTF16ToWide(l10n_util::GetStringUTF16( |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | 426 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); |
| 427 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 427 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
| 428 GridLayout::USE_PREF, 0, 0); | 428 GridLayout::USE_PREF, 0, 0); |
| 429 | 429 |
| 430 // Add Encoding Combobox. | 430 // Add Encoding Combobox. |
| 431 layout->StartRow(0, double_column_view_set_id); | 431 layout->StartRow(0, double_column_view_set_id); |
| 432 layout->AddView(default_encoding_combobox_label_); | 432 layout->AddView(default_encoding_combobox_label_); |
| 433 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, | 433 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, |
| 434 GridLayout::CENTER); | 434 GridLayout::CENTER); |
| 435 } | 435 } |
| OLD | NEW |