Index: views/controls/message_box_view.cc |
=================================================================== |
--- views/controls/message_box_view.cc (revision 71854) |
+++ views/controls/message_box_view.cc (working copy) |
@@ -4,12 +4,12 @@ |
#include "views/controls/message_box_view.h" |
-#include "app/message_box_flags.h" |
#include "base/i18n/rtl.h" |
#include "base/message_loop.h" |
#include "base/utf_string_conversions.h" |
#include "ui/base/clipboard/clipboard.h" |
#include "ui/base/clipboard/scoped_clipboard_writer.h" |
+#include "ui/base/message_box_flags.h" |
#include "views/controls/button/checkbox.h" |
#include "views/standard_layout.h" |
#include "views/views_delegate.h" |
@@ -118,7 +118,7 @@ |
const std::wstring& default_prompt) { |
message_label_->SetMultiLine(true); |
message_label_->SetAllowCharacterBreak(true); |
- if (dialog_flags & MessageBoxFlags::kAutoDetectAlignment) { |
+ if (dialog_flags & ui::MessageBoxFlags::kAutoDetectAlignment) { |
// Determine the alignment and directionality based on the first character |
// with strong directionality. |
base::i18n::TextDirection direction = |
@@ -137,7 +137,7 @@ |
message_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
} |
- if (dialog_flags & MessageBoxFlags::kFlagHasPromptField) { |
+ if (dialog_flags & ui::MessageBoxFlags::kFlagHasPromptField) { |
prompt_field_ = new views::Textfield; |
prompt_field_->SetText(WideToUTF16Hack(default_prompt)); |
} |