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

Side by Side Diff: chrome/browser/ui/app_modal_dialogs/js_modal_dialog.cc

Issue 8553001: views: Add an Options enum to MessageBoxView control. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 9 years 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/app_modal_dialogs/js_modal_dialog.h" 5 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
6 6
7 #include "chrome/browser/browser_shutdown.h" 7 #include "chrome/browser/browser_shutdown.h"
8 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" 8 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
9 #include "ui/base/text/text_elider.h" 9 #include "ui/base/text/text_elider.h"
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } // namespace 43 } // namespace
44 44
45 ChromeJavaScriptDialogExtraData::ChromeJavaScriptDialogExtraData() 45 ChromeJavaScriptDialogExtraData::ChromeJavaScriptDialogExtraData()
46 : suppress_javascript_messages_(false) { 46 : suppress_javascript_messages_(false) {
47 } 47 }
48 48
49 JavaScriptAppModalDialog::JavaScriptAppModalDialog( 49 JavaScriptAppModalDialog::JavaScriptAppModalDialog(
50 content::JavaScriptDialogDelegate* delegate, 50 content::JavaScriptDialogDelegate* delegate,
51 ChromeJavaScriptDialogExtraData* extra_data, 51 ChromeJavaScriptDialogExtraData* extra_data,
52 const string16& title, 52 const string16& title,
53 int dialog_flags, 53 ui::JavascriptMessageType javascript_message_type,
54 const string16& message_text, 54 const string16& message_text,
55 const string16& default_prompt_text, 55 const string16& default_prompt_text,
56 bool display_suppress_checkbox, 56 bool display_suppress_checkbox,
57 bool is_before_unload_dialog, 57 bool is_before_unload_dialog,
58 IPC::Message* reply_msg) 58 IPC::Message* reply_msg)
59 : AppModalDialog(delegate, title), 59 : AppModalDialog(delegate, title),
60 extra_data_(extra_data), 60 extra_data_(extra_data),
61 dialog_flags_(dialog_flags), 61 javascript_message_type_(javascript_message_type),
62 display_suppress_checkbox_(display_suppress_checkbox), 62 display_suppress_checkbox_(display_suppress_checkbox),
63 is_before_unload_dialog_(is_before_unload_dialog), 63 is_before_unload_dialog_(is_before_unload_dialog),
64 reply_msg_(reply_msg), 64 reply_msg_(reply_msg),
65 use_override_prompt_text_(false) { 65 use_override_prompt_text_(false) {
66 EnforceMaxTextSize(message_text, &message_text_); 66 EnforceMaxTextSize(message_text, &message_text_);
67 EnforceMaxPromptSize(default_prompt_text, &default_prompt_text_); 67 EnforceMaxPromptSize(default_prompt_text, &default_prompt_text_);
68 } 68 }
69 69
70 JavaScriptAppModalDialog::~JavaScriptAppModalDialog() { 70 JavaScriptAppModalDialog::~JavaScriptAppModalDialog() {
71 } 71 }
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 delegate()->OnDialogClosed(reply_msg_, success, user_input); 141 delegate()->OnDialogClosed(reply_msg_, success, user_input);
142 142
143 extra_data_->last_javascript_message_dismissal_ = base::TimeTicks::Now(); 143 extra_data_->last_javascript_message_dismissal_ = base::TimeTicks::Now();
144 extra_data_->suppress_javascript_messages_ = suppress_js_messages; 144 extra_data_->suppress_javascript_messages_ = suppress_js_messages;
145 145
146 // On Views, we can end up coming through this code path twice :(. 146 // On Views, we can end up coming through this code path twice :(.
147 // See crbug.com/63732. 147 // See crbug.com/63732.
148 valid_ = false; 148 valid_ = false;
149 } 149 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698