| 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 <vsstyle.h> | 5 #include <vsstyle.h> |
| 6 #include <vssym32.h> | 6 #include <vssym32.h> |
| 7 | 7 |
| 8 #include "chrome/browser/views/options/options_group_view.h" | 8 #include "chrome/browser/views/options/options_group_view.h" |
| 9 | 9 |
| 10 #include "base/gfx/native_theme.h" | 10 #include "base/gfx/native_theme.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 title_label_(new views::Label(title)), | 33 title_label_(new views::Label(title)), |
| 34 description_label_(new views::Label(description)), | 34 description_label_(new views::Label(description)), |
| 35 separator_(NULL), | 35 separator_(NULL), |
| 36 show_separator_(show_separator), | 36 show_separator_(show_separator), |
| 37 highlighted_(false) { | 37 highlighted_(false) { |
| 38 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 38 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 39 ChromeFont title_font = | 39 ChromeFont title_font = |
| 40 rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, ChromeFont::BOLD); | 40 rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, ChromeFont::BOLD); |
| 41 title_label_->SetFont(title_font); | 41 title_label_->SetFont(title_font); |
| 42 SkColor title_color = gfx::NativeTheme::instance()->GetThemeColorWithDefault( | 42 SkColor title_color = gfx::NativeTheme::instance()->GetThemeColorWithDefault( |
| 43 gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, COLOR_WI
NDOWTEXT); | 43 gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, |
| 44 COLOR_WINDOWTEXT); |
| 44 title_label_->SetColor(title_color); | 45 title_label_->SetColor(title_color); |
| 45 title_label_->SetMultiLine(true); | 46 title_label_->SetMultiLine(true); |
| 46 title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 47 title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
| 47 | 48 |
| 48 description_label_->SetMultiLine(true); | 49 description_label_->SetMultiLine(true); |
| 49 description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 50 description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
| 50 } | 51 } |
| 51 | 52 |
| 52 void OptionsGroupView::SetHighlighted(bool highlighted) { | 53 void OptionsGroupView::SetHighlighted(bool highlighted) { |
| 53 highlighted_ = highlighted; | 54 highlighted_ = highlighted; |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 column_set = layout->AddColumnSet(single_column_layout_id); | 128 column_set = layout->AddColumnSet(single_column_layout_id); |
| 128 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, | 129 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, |
| 129 GridLayout::USE_PREF, 0, 0); | 130 GridLayout::USE_PREF, 0, 0); |
| 130 | 131 |
| 131 separator_ = new views::Separator; | 132 separator_ = new views::Separator; |
| 132 layout->StartRow(0, single_column_layout_id); | 133 layout->StartRow(0, single_column_layout_id); |
| 133 layout->AddView(separator_); | 134 layout->AddView(separator_); |
| 134 } | 135 } |
| 135 } | 136 } |
| 136 | 137 |
| OLD | NEW |