summaryrefslogtreecommitdiffstats
path: root/chrome/views/message_box_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/views/message_box_view.cc')
-rw-r--r--chrome/views/message_box_view.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/views/message_box_view.cc b/chrome/views/message_box_view.cc
index bf2ac5f..beeb708 100644
--- a/chrome/views/message_box_view.cc
+++ b/chrome/views/message_box_view.cc
@@ -22,7 +22,7 @@ MessageBoxView::MessageBoxView(int dialog_flags,
const std::wstring& message,
const std::wstring& default_prompt,
int message_width)
- : message_label_(new ChromeViews::Label(message)),
+ : message_label_(new views::Label(message)),
prompt_field_(NULL),
icon_(NULL),
check_box_(NULL),
@@ -34,7 +34,7 @@ MessageBoxView::MessageBoxView(int dialog_flags,
MessageBoxView::MessageBoxView(int dialog_flags,
const std::wstring& message,
const std::wstring& default_prompt)
- : message_label_(new ChromeViews::Label(message)),
+ : message_label_(new views::Label(message)),
prompt_field_(NULL),
icon_(NULL),
check_box_(NULL),
@@ -57,7 +57,7 @@ bool MessageBoxView::IsCheckBoxSelected() {
void MessageBoxView::SetIcon(const SkBitmap& icon) {
if (!icon_)
- icon_ = new ChromeViews::ImageView();
+ icon_ = new views::ImageView();
icon_->SetImage(icon);
icon_->SetBounds(0, 0, icon.width(), icon.height());
ResetLayoutManager();
@@ -65,18 +65,18 @@ void MessageBoxView::SetIcon(const SkBitmap& icon) {
void MessageBoxView::SetCheckBoxLabel(const std::wstring& label) {
if (!check_box_)
- check_box_ = new ChromeViews::CheckBox(label);
+ check_box_ = new views::CheckBox(label);
else
check_box_->SetLabel(label);
ResetLayoutManager();
}
///////////////////////////////////////////////////////////////////////////////
-// MessageBoxView, ChromeViews::View overrides:
+// MessageBoxView, views::View overrides:
void MessageBoxView::ViewHierarchyChanged(bool is_add,
- ChromeViews::View* parent,
- ChromeViews::View* child) {
+ views::View* parent,
+ views::View* child) {
if (child == this && is_add) {
if (prompt_field_)
prompt_field_->SelectAll();
@@ -101,10 +101,10 @@ void MessageBoxView::FocusFirstFocusableControl() {
void MessageBoxView::Init(int dialog_flags,
const std::wstring& default_prompt) {
message_label_->SetMultiLine(true);
- message_label_->SetHorizontalAlignment(ChromeViews::Label::ALIGN_LEFT);
+ message_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
if (dialog_flags & kFlagHasPromptField) {
- prompt_field_ = new ChromeViews::TextField;
+ prompt_field_ = new views::TextField;
prompt_field_->SetText(default_prompt);
}
@@ -112,8 +112,8 @@ void MessageBoxView::Init(int dialog_flags,
}
void MessageBoxView::ResetLayoutManager() {
- using ChromeViews::GridLayout;
- using ChromeViews::ColumnSet;
+ using views::GridLayout;
+ using views::ColumnSet;
// Initialize the Grid Layout Manager used for this dialog box.
GridLayout* layout = CreatePanelGridLayout(this);