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

Unified Diff: chrome/browser/ui/views/restart_message_box.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/repost_form_warning_view.cc ('k') | chrome/browser/ui/views/status_bubble_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/restart_message_box.cc
===================================================================
--- chrome/browser/ui/views/restart_message_box.cc (revision 71854)
+++ chrome/browser/ui/views/restart_message_box.cc (working copy)
@@ -5,10 +5,10 @@
#include "chrome/browser/ui/views/restart_message_box.h"
#include "app/l10n_util.h"
-#include "app/message_box_flags.h"
#include "base/utf_string_conversions.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
+#include "ui/base/message_box_flags.h"
#include "views/controls/message_box_view.h"
#include "views/window/window.h"
@@ -22,12 +22,12 @@
}
int RestartMessageBox::GetDialogButtons() const {
- return MessageBoxFlags::DIALOGBUTTON_OK;
+ return ui::MessageBoxFlags::DIALOGBUTTON_OK;
}
std::wstring RestartMessageBox::GetDialogButtonLabel(
- MessageBoxFlags::DialogButton button) const {
- DCHECK(button == MessageBoxFlags::DIALOGBUTTON_OK);
+ ui::MessageBoxFlags::DialogButton button) const {
+ DCHECK(button == ui::MessageBoxFlags::DIALOGBUTTON_OK);
return UTF16ToWide(l10n_util::GetStringUTF16(IDS_OK));
}
@@ -54,7 +54,8 @@
const int kDialogWidth = 400;
// Also deleted when the window closes.
message_box_view_ = new MessageBoxView(
- MessageBoxFlags::kFlagHasMessage | MessageBoxFlags::kFlagHasOKButton,
+ ui::MessageBoxFlags::kFlagHasMessage |
+ ui::MessageBoxFlags::kFlagHasOKButton,
UTF16ToWide(
l10n_util::GetStringUTF16(IDS_OPTIONS_RESTART_REQUIRED)).c_str(),
std::wstring(),
« no previous file with comments | « chrome/browser/ui/views/repost_form_warning_view.cc ('k') | chrome/browser/ui/views/status_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698