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

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

Issue 10451047: content: Move javascript_message_type.h into content/ from ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm CONTEXT_EXPORT Created 8 years, 6 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 | Annotate | Revision Log
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 "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" 5 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_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 "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "content/public/browser/web_contents_view.h" 10 #include "content/public/browser/web_contents_view.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } // namespace 48 } // namespace
49 49
50 ChromeJavaScriptDialogExtraData::ChromeJavaScriptDialogExtraData() 50 ChromeJavaScriptDialogExtraData::ChromeJavaScriptDialogExtraData()
51 : suppress_javascript_messages_(false) { 51 : suppress_javascript_messages_(false) {
52 } 52 }
53 53
54 JavaScriptAppModalDialog::JavaScriptAppModalDialog( 54 JavaScriptAppModalDialog::JavaScriptAppModalDialog(
55 WebContents* web_contents, 55 WebContents* web_contents,
56 ChromeJavaScriptDialogExtraData* extra_data, 56 ChromeJavaScriptDialogExtraData* extra_data,
57 const string16& title, 57 const string16& title,
58 ui::JavascriptMessageType javascript_message_type, 58 content::JavaScriptMessageType javascript_message_type,
59 const string16& message_text, 59 const string16& message_text,
60 const string16& default_prompt_text, 60 const string16& default_prompt_text,
61 bool display_suppress_checkbox, 61 bool display_suppress_checkbox,
62 bool is_before_unload_dialog, 62 bool is_before_unload_dialog,
63 bool is_reload, 63 bool is_reload,
64 const JavaScriptDialogCreator::DialogClosedCallback& callback) 64 const JavaScriptDialogCreator::DialogClosedCallback& callback)
65 : AppModalDialog(web_contents, title), 65 : AppModalDialog(web_contents, title),
66 extra_data_(extra_data), 66 extra_data_(extra_data),
67 javascript_message_type_(javascript_message_type), 67 javascript_message_type_(javascript_message_type),
68 display_suppress_checkbox_(display_suppress_checkbox), 68 display_suppress_checkbox_(display_suppress_checkbox),
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 callback_.Run(success, user_input); 145 callback_.Run(success, user_input);
146 146
147 extra_data_->last_javascript_message_dismissal_ = base::TimeTicks::Now(); 147 extra_data_->last_javascript_message_dismissal_ = base::TimeTicks::Now();
148 extra_data_->suppress_javascript_messages_ = suppress_js_messages; 148 extra_data_->suppress_javascript_messages_ = suppress_js_messages;
149 149
150 // On Views, we can end up coming through this code path twice :(. 150 // On Views, we can end up coming through this code path twice :(.
151 // See crbug.com/63732. 151 // See crbug.com/63732.
152 valid_ = false; 152 valid_ = false;
153 } 153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698