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

Side by Side Diff: chrome/browser/ui/views/js_modal_dialog_views.cc

Issue 8536026: Convert MessageBoxFlags class into an enum. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/js_modal_dialog_views.h" 5 #include "chrome/browser/ui/views/js_modal_dialog_views.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" 8 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
9 #include "chrome/browser/ui/views/window.h" 9 #include "chrome/browser/ui/views/window.h"
10 #include "grit/generated_resources.h" 10 #include "grit/generated_resources.h"
11 #include "ui/base/keycodes/keyboard_codes.h" 11 #include "ui/base/keycodes/keyboard_codes.h"
12 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
13 #include "ui/base/message_box_flags.h" 13 #include "ui/base/message_box_flags.h"
14 #include "views/controls/message_box_view.h" 14 #include "views/controls/message_box_view.h"
15 #include "views/controls/textfield/textfield.h" 15 #include "views/controls/textfield/textfield.h"
16 #include "views/widget/widget.h" 16 #include "views/widget/widget.h"
17 17
18 //////////////////////////////////////////////////////////////////////////////// 18 ////////////////////////////////////////////////////////////////////////////////
19 // JSModalDialogViews, public: 19 // JSModalDialogViews, public:
20 20
21 JSModalDialogViews::JSModalDialogViews( 21 JSModalDialogViews::JSModalDialogViews(
22 JavaScriptAppModalDialog* parent) 22 JavaScriptAppModalDialog* parent)
23 : parent_(parent), 23 : parent_(parent),
24 message_box_view_(new views::MessageBoxView( 24 message_box_view_(new views::MessageBoxView(
25 parent->dialog_flags() | ui::MessageBoxFlags::kAutoDetectAlignment, 25 parent->dialog_flags() | ui::MESSAGE_BOX_AUTO_DETECT_ALIGNMENT,
26 parent->message_text(), 26 parent->message_text(),
27 parent->default_prompt_text())) { 27 parent->default_prompt_text())) {
28 DCHECK(message_box_view_); 28 DCHECK(message_box_view_);
29 29
30 message_box_view_->AddAccelerator( 30 message_box_view_->AddAccelerator(
31 views::Accelerator(ui::VKEY_C, false, true, false)); 31 views::Accelerator(ui::VKEY_C, false, true, false));
32 if (parent->display_suppress_checkbox()) { 32 if (parent->display_suppress_checkbox()) {
33 message_box_view_->SetCheckBoxLabel( 33 message_box_view_->SetCheckBoxLabel(
34 l10n_util::GetStringUTF16(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION)); 34 l10n_util::GetStringUTF16(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION));
35 } 35 }
(...skipping 27 matching lines...) Expand all
63 } 63 }
64 64
65 void JSModalDialogViews::CancelAppModalDialog() { 65 void JSModalDialogViews::CancelAppModalDialog() {
66 GetDialogClientView()->CancelWindow(); 66 GetDialogClientView()->CancelWindow();
67 } 67 }
68 68
69 ////////////////////////////////////////////////////////////////////////////// 69 //////////////////////////////////////////////////////////////////////////////
70 // JSModalDialogViews, views::DialogDelegate implementation: 70 // JSModalDialogViews, views::DialogDelegate implementation:
71 71
72 int JSModalDialogViews::GetDefaultDialogButton() const { 72 int JSModalDialogViews::GetDefaultDialogButton() const {
73 if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasOKButton) 73 if (parent_->dialog_flags() & ui::MESSAGE_BOX_HAS_OK_BUTTON)
74 return ui::DIALOG_BUTTON_OK; 74 return ui::DIALOG_BUTTON_OK;
75 75
76 if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasCancelButton) 76 if (parent_->dialog_flags() & ui::MESSAGE_BOX_HAS_CANCEL_BUTTON)
77 return ui::DIALOG_BUTTON_CANCEL; 77 return ui::DIALOG_BUTTON_CANCEL;
78 78
79 return ui::DIALOG_BUTTON_NONE; 79 return ui::DIALOG_BUTTON_NONE;
80 } 80 }
81 81
82 int JSModalDialogViews::GetDialogButtons() const { 82 int JSModalDialogViews::GetDialogButtons() const {
83 int dialog_buttons = 0; 83 int dialog_buttons = 0;
84 if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasOKButton) 84 if (parent_->dialog_flags() & ui::MESSAGE_BOX_HAS_OK_BUTTON)
85 dialog_buttons = ui::DIALOG_BUTTON_OK; 85 dialog_buttons = ui::DIALOG_BUTTON_OK;
86 86
87 if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasCancelButton) 87 if (parent_->dialog_flags() & ui::MESSAGE_BOX_HAS_CANCEL_BUTTON)
88 dialog_buttons |= ui::DIALOG_BUTTON_CANCEL; 88 dialog_buttons |= ui::DIALOG_BUTTON_CANCEL;
89 89
90 return dialog_buttons; 90 return dialog_buttons;
91 } 91 }
92 92
93 string16 JSModalDialogViews::GetWindowTitle() const { 93 string16 JSModalDialogViews::GetWindowTitle() const {
94 return parent_->title(); 94 return parent_->title();
95 } 95 }
96 96
97 97
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 // static 163 // static
164 NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt( 164 NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt(
165 JavaScriptAppModalDialog* dialog, 165 JavaScriptAppModalDialog* dialog,
166 gfx::NativeWindow parent_window) { 166 gfx::NativeWindow parent_window) {
167 JSModalDialogViews* d = new JSModalDialogViews(dialog); 167 JSModalDialogViews* d = new JSModalDialogViews(dialog);
168 168
169 browser::CreateViewsWindow(parent_window, d); 169 browser::CreateViewsWindow(parent_window, d);
170 return d; 170 return d;
171 } 171 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698