summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/options/options_group_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/views/options/options_group_view.cc')
-rw-r--r--chrome/browser/views/options/options_group_view.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index 5dbe96a..3fbbe08 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -26,13 +26,13 @@ static const int kOptionsGroupViewColumnSpacing = 30;
///////////////////////////////////////////////////////////////////////////////
// OptionsGroupView, public:
-OptionsGroupView::OptionsGroupView(ChromeViews::View* contents,
+OptionsGroupView::OptionsGroupView(views::View* contents,
const std::wstring& title,
const std::wstring& description,
bool show_separator)
: contents_(contents),
- title_label_(new ChromeViews::Label(title)),
- description_label_(new ChromeViews::Label(description)),
+ title_label_(new views::Label(title)),
+ description_label_(new views::Label(description)),
separator_(NULL),
show_separator_(show_separator),
highlighted_(false) {
@@ -44,10 +44,10 @@ OptionsGroupView::OptionsGroupView(ChromeViews::View* contents,
gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, COLOR_WINDOWTEXT);
title_label_->SetColor(title_color);
title_label_->SetMultiLine(true);
- title_label_->SetHorizontalAlignment(ChromeViews::Label::ALIGN_LEFT);
+ title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
description_label_->SetMultiLine(true);
- description_label_->SetHorizontalAlignment(ChromeViews::Label::ALIGN_LEFT);
+ description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
}
void OptionsGroupView::SetHighlighted(bool highlighted) {
@@ -60,7 +60,7 @@ int OptionsGroupView::GetContentsWidth() const {
}
///////////////////////////////////////////////////////////////////////////////
-// OptionsGroupView, ChromeViews::View overrides:
+// OptionsGroupView, views::View overrides:
void OptionsGroupView::Paint(ChromeCanvas* canvas) {
if (highlighted_) {
@@ -75,8 +75,8 @@ void OptionsGroupView::Paint(ChromeCanvas* canvas) {
}
void OptionsGroupView::ViewHierarchyChanged(bool is_add,
- ChromeViews::View* parent,
- ChromeViews::View* child) {
+ views::View* parent,
+ views::View* child) {
if (is_add && child == this)
Init();
}
@@ -85,8 +85,8 @@ void OptionsGroupView::ViewHierarchyChanged(bool is_add,
// OptionsGroupView, private:
void OptionsGroupView::Init() {
- using ChromeViews::GridLayout;
- using ChromeViews::ColumnSet;
+ using views::GridLayout;
+ using views::ColumnSet;
GridLayout* layout = new GridLayout(this);
SetLayoutManager(layout);
@@ -129,7 +129,7 @@ void OptionsGroupView::Init() {
column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
GridLayout::USE_PREF, 0, 0);
- separator_ = new ChromeViews::Separator;
+ separator_ = new views::Separator;
layout->StartRow(0, single_column_layout_id);
layout->AddView(separator_);
}