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: components/app_modal_dialogs/javascript_app_modal_dialog.cc

Issue 648833004: Componentize app_modal_dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: owners Created 6 years, 2 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 "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" 5 #include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
6 6
7 #include "chrome/browser/browser_shutdown.h" 7 #include "components/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" 8 #include "content/public/browser/web_contents.h"
10 #include "ui/gfx/text_elider.h" 9 #include "ui/gfx/text_elider.h"
11 10
12 #if defined(USE_AURA) 11 #if defined(USE_AURA)
13 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
14 #include "ui/aura/window_event_dispatcher.h" 13 #include "ui/aura/window_event_dispatcher.h"
15 #endif 14 #endif
16 15
17 using content::JavaScriptDialogManager; 16 using content::JavaScriptDialogManager;
18 using content::WebContents; 17 using content::WebContents;
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 if (extra_data != extra_data_map_->end()) { 167 if (extra_data != extra_data_map_->end()) {
169 extra_data->second.last_javascript_message_dismissal_ = 168 extra_data->second.last_javascript_message_dismissal_ =
170 base::TimeTicks::Now(); 169 base::TimeTicks::Now();
171 extra_data->second.suppress_javascript_messages_ = suppress_js_messages; 170 extra_data->second.suppress_javascript_messages_ = suppress_js_messages;
172 } 171 }
173 172
174 // 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 :(.
175 // See crbug.com/63732. 174 // See crbug.com/63732.
176 AppModalDialog::Invalidate(); 175 AppModalDialog::Invalidate();
177 } 176 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698