Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(667)

Unified Diff: chrome/browser/ui/views/confirm_message_box_dialog.cc

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/bookmark_bar_view.cc ('k') | chrome/browser/ui/views/default_search_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/confirm_message_box_dialog.cc
===================================================================
--- chrome/browser/ui/views/confirm_message_box_dialog.cc (revision 71854)
+++ chrome/browser/ui/views/confirm_message_box_dialog.cc (working copy)
@@ -5,10 +5,10 @@
#include "chrome/browser/ui/views/confirm_message_box_dialog.h"
#include "app/l10n_util.h"
-#include "app/message_box_flags.h"
#include "base/utf_string_conversions.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
+#include "ui/base/message_box_flags.h"
#include "views/standard_layout.h"
#include "views/widget/widget.h"
#include "views/window/window.h"
@@ -65,8 +65,8 @@
}
int ConfirmMessageBoxDialog::GetDialogButtons() const {
- return MessageBoxFlags::DIALOGBUTTON_OK |
- MessageBoxFlags::DIALOGBUTTON_CANCEL;
+ return ui::MessageBoxFlags::DIALOGBUTTON_OK |
+ ui::MessageBoxFlags::DIALOGBUTTON_CANCEL;
}
std::wstring ConfirmMessageBoxDialog::GetWindowTitle() const {
@@ -74,11 +74,11 @@
}
std::wstring ConfirmMessageBoxDialog::GetDialogButtonLabel(
- MessageBoxFlags::DialogButton button) const {
- if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
+ ui::MessageBoxFlags::DialogButton button) const {
+ if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) {
return confirm_label_;
}
- if (button == MessageBoxFlags::DIALOGBUTTON_CANCEL)
+ if (button == ui::MessageBoxFlags::DIALOGBUTTON_CANCEL)
return reject_label_;
return DialogDelegate::GetDialogButtonLabel(button);
}
« no previous file with comments | « chrome/browser/ui/views/bookmark_bar_view.cc ('k') | chrome/browser/ui/views/default_search_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698