| OLD | NEW |
| 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_dialogs/javascript_app_modal_dialog.h" | 5 #include "components/app_modal/javascript_app_modal_dialog.h" |
| 6 | 6 |
| 7 #include "components/app_modal_dialogs/javascript_dialog_manager_impl.h" | 7 #include "components/app_modal/javascript_dialog_manager_impl.h" |
| 8 #include "components/app_modal_dialogs/javascript_native_dialog_factory.h" | 8 #include "components/app_modal/javascript_native_dialog_factory.h" |
| 9 #include "content/public/browser/web_contents.h" | 9 #include "content/public/browser/web_contents.h" |
| 10 #include "ui/gfx/text_elider.h" | 10 #include "ui/gfx/text_elider.h" |
| 11 | 11 |
| 12 #if defined(USE_AURA) | 12 #if defined(USE_AURA) |
| 13 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
| 14 #include "ui/aura/window_event_dispatcher.h" | 14 #include "ui/aura/window_event_dispatcher.h" |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 using content::JavaScriptDialogManager; | 17 using content::JavaScriptDialogManager; |
| 18 using content::WebContents; | 18 using content::WebContents; |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 if (extra_data != extra_data_map_->end()) { | 167 if (extra_data != extra_data_map_->end()) { |
| 168 extra_data->second.last_javascript_message_dismissal_ = | 168 extra_data->second.last_javascript_message_dismissal_ = |
| 169 base::TimeTicks::Now(); | 169 base::TimeTicks::Now(); |
| 170 extra_data->second.suppress_javascript_messages_ = suppress_js_messages; | 170 extra_data->second.suppress_javascript_messages_ = suppress_js_messages; |
| 171 } | 171 } |
| 172 | 172 |
| 173 // On Views, we can end up coming through this code path twice :(. | 173 // On Views, we can end up coming through this code path twice :(. |
| 174 // See crbug.com/63732. | 174 // See crbug.com/63732. |
| 175 AppModalDialog::Invalidate(); | 175 AppModalDialog::Invalidate(); |
| 176 } | 176 } |
| OLD | NEW |