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

Side by Side Diff: components/app_modal/javascript_app_modal_dialog.cc

Issue 2684093002: Rename JavaScript "messages" to "dialogs". (Closed)
Patch Set: win fox Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "components/app_modal/javascript_app_modal_dialog.h" 5 #include "components/app_modal/javascript_app_modal_dialog.h"
6 6
7 #include "base/metrics/histogram_macros.h" 7 #include "base/metrics/histogram_macros.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "components/app_modal/javascript_dialog_manager.h" 10 #include "components/app_modal/javascript_dialog_manager.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 ChromeJavaScriptDialogExtraData::ChromeJavaScriptDialogExtraData() 53 ChromeJavaScriptDialogExtraData::ChromeJavaScriptDialogExtraData()
54 : has_already_shown_a_dialog_(false), 54 : has_already_shown_a_dialog_(false),
55 suppress_javascript_messages_(false), 55 suppress_javascript_messages_(false),
56 suppressed_dialog_count_(0) {} 56 suppressed_dialog_count_(0) {}
57 57
58 JavaScriptAppModalDialog::JavaScriptAppModalDialog( 58 JavaScriptAppModalDialog::JavaScriptAppModalDialog(
59 content::WebContents* web_contents, 59 content::WebContents* web_contents,
60 ExtraDataMap* extra_data_map, 60 ExtraDataMap* extra_data_map,
61 const base::string16& title, 61 const base::string16& title,
62 content::JavaScriptMessageType javascript_message_type, 62 content::JavaScriptDialogType javascript_dialog_type,
63 const base::string16& message_text, 63 const base::string16& message_text,
64 const base::string16& default_prompt_text, 64 const base::string16& default_prompt_text,
65 bool display_suppress_checkbox, 65 bool display_suppress_checkbox,
66 bool is_before_unload_dialog, 66 bool is_before_unload_dialog,
67 bool is_reload, 67 bool is_reload,
68 const content::JavaScriptDialogManager::DialogClosedCallback& callback) 68 const content::JavaScriptDialogManager::DialogClosedCallback& callback)
69 : AppModalDialog(web_contents, title), 69 : AppModalDialog(web_contents, title),
70 extra_data_map_(extra_data_map), 70 extra_data_map_(extra_data_map),
71 javascript_message_type_(javascript_message_type), 71 javascript_dialog_type_(javascript_dialog_type),
72 display_suppress_checkbox_(display_suppress_checkbox), 72 display_suppress_checkbox_(display_suppress_checkbox),
73 is_before_unload_dialog_(is_before_unload_dialog), 73 is_before_unload_dialog_(is_before_unload_dialog),
74 is_reload_(is_reload), 74 is_reload_(is_reload),
75 callback_(callback), 75 callback_(callback),
76 use_override_prompt_text_(false), 76 use_override_prompt_text_(false),
77 creation_time_(base::TimeTicks::Now()) { 77 creation_time_(base::TimeTicks::Now()) {
78 EnforceMaxTextSize(message_text, &message_text_); 78 EnforceMaxTextSize(message_text, &message_text_);
79 EnforceMaxPromptSize(default_prompt_text, &default_prompt_text_); 79 EnforceMaxPromptSize(default_prompt_text, &default_prompt_text_);
80 } 80 }
81 81
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 UMA_HISTOGRAM_MEDIUM_TIMES( 165 UMA_HISTOGRAM_MEDIUM_TIMES(
166 "JSDialogs.FineTiming.TimeBetweenDialogCreatedAndSameDialogClosed", 166 "JSDialogs.FineTiming.TimeBetweenDialogCreatedAndSameDialogClosed",
167 base::TimeTicks::Now() - creation_time_); 167 base::TimeTicks::Now() - creation_time_);
168 if (!callback_.is_null()) { 168 if (!callback_.is_null()) {
169 callback_.Run(success, user_input); 169 callback_.Run(success, user_input);
170 callback_.Reset(); 170 callback_.Reset();
171 } 171 }
172 } 172 }
173 173
174 } // namespace app_modal 174 } // namespace app_modal
OLDNEW
« no previous file with comments | « components/app_modal/javascript_app_modal_dialog.h ('k') | components/app_modal/javascript_dialog_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698