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

Unified Diff: chrome/browser/jsmessage_box_handler_win.cc

Issue 56026: Move message flags into a separate header that can be used (Closed)
Patch Set: ctor Created 11 years, 9 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/js_before_unload_handler_win.cc ('k') | chrome/browser/views/external_protocol_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/jsmessage_box_handler_win.cc
diff --git a/chrome/browser/jsmessage_box_handler_win.cc b/chrome/browser/jsmessage_box_handler_win.cc
index 1b6ef07cedc3302c15af0ed13db2933421ba70cd..847f7cfd4909b6a1f85258a68b9f1080a615b371 100644
--- a/chrome/browser/jsmessage_box_handler_win.cc
+++ b/chrome/browser/jsmessage_box_handler_win.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/tab_contents/web_contents.h"
#include "chrome/common/gfx/text_elider.h"
#include "chrome/common/l10n_util.h"
+#include "chrome/common/message_box_flags.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_type.h"
#include "chrome/common/pref_names.h"
@@ -47,7 +48,7 @@ JavascriptMessageBoxHandler::JavascriptMessageBoxHandler(
dialog_flags_(dialog_flags),
dialog_(NULL),
message_box_view_(new MessageBoxView(
- dialog_flags | MessageBoxView::kAutoDetectAlignment,
+ dialog_flags | MessageBox::kAutoDetectAlignment,
message_text, default_prompt_text)) {
DCHECK(message_box_view_);
DCHECK(reply_msg_);
@@ -73,10 +74,10 @@ JavascriptMessageBoxHandler::~JavascriptMessageBoxHandler() {
int JavascriptMessageBoxHandler::GetDialogButtons() const {
int dialog_buttons = 0;
- if (dialog_flags_ & MessageBoxView::kFlagHasOKButton)
+ if (dialog_flags_ & MessageBox::kFlagHasOKButton)
dialog_buttons = DIALOGBUTTON_OK;
- if (dialog_flags_ & MessageBoxView::kFlagHasCancelButton)
+ if (dialog_flags_ & MessageBox::kFlagHasCancelButton)
dialog_buttons |= DIALOGBUTTON_CANCEL;
return dialog_buttons;
« no previous file with comments | « chrome/browser/js_before_unload_handler_win.cc ('k') | chrome/browser/views/external_protocol_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698