| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/fonts_page_view.h" | 5 #include "chrome/browser/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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, ChromeFont::BOLD); | 202 rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, ChromeFont::BOLD); |
| 203 title_label->SetFont(title_font); | 203 title_label->SetFont(title_font); |
| 204 SkColor title_color = | 204 SkColor title_color = |
| 205 gfx::NativeTheme::instance()->GetThemeColorWithDefault( | 205 gfx::NativeTheme::instance()->GetThemeColorWithDefault( |
| 206 gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, | 206 gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, |
| 207 COLOR_WINDOWTEXT); | 207 COLOR_WINDOWTEXT); |
| 208 title_label->SetColor(title_color); | 208 title_label->SetColor(title_color); |
| 209 } | 209 } |
| 210 | 210 |
| 211 FontsPageView::FontsPageView(Profile* profile) | 211 FontsPageView::FontsPageView(Profile* profile) |
| 212 : select_font_dialog_(SelectFontDialog::Create(this)), | 212 : ALLOW_THIS_IN_INITIALIZER_LIST( |
| 213 select_font_dialog_(SelectFontDialog::Create(this))), |
| 213 fonts_group_title_(NULL), | 214 fonts_group_title_(NULL), |
| 214 encoding_group_title_(NULL), | 215 encoding_group_title_(NULL), |
| 215 fixed_width_font_change_page_button_(NULL), | 216 fixed_width_font_change_page_button_(NULL), |
| 216 serif_font_change_page_button_(NULL), | 217 serif_font_change_page_button_(NULL), |
| 217 sans_serif_font_change_page_button_(NULL), | 218 sans_serif_font_change_page_button_(NULL), |
| 218 fixed_width_font_label_(NULL), | 219 fixed_width_font_label_(NULL), |
| 219 serif_font_label_(NULL), | 220 serif_font_label_(NULL), |
| 220 sans_serif_font_label_(NULL), | 221 sans_serif_font_label_(NULL), |
| 221 default_encoding_combobox_(NULL), | 222 default_encoding_combobox_(NULL), |
| 222 serif_button_pressed_(false), | 223 serif_button_pressed_(false), |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | 509 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); |
| 509 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 510 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
| 510 GridLayout::USE_PREF, 0, 0); | 511 GridLayout::USE_PREF, 0, 0); |
| 511 | 512 |
| 512 // Add Encoding ComboBox. | 513 // Add Encoding ComboBox. |
| 513 layout->StartRow(0, double_column_view_set_id); | 514 layout->StartRow(0, double_column_view_set_id); |
| 514 layout->AddView(default_encoding_combobox_label_); | 515 layout->AddView(default_encoding_combobox_label_); |
| 515 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, | 516 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, |
| 516 GridLayout::CENTER); | 517 GridLayout::CENTER); |
| 517 } | 518 } |
| OLD | NEW |