Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "content/browser/renderer_host/render_view_host.h" | 5 #include "content/browser/renderer_host/render_view_host.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1055 const string16& message, | 1055 const string16& message, |
| 1056 const string16& default_prompt, | 1056 const string16& default_prompt, |
| 1057 const GURL& frame_url, | 1057 const GURL& frame_url, |
| 1058 const int flags, | 1058 const int flags, |
| 1059 IPC::Message* reply_msg) { | 1059 IPC::Message* reply_msg) { |
| 1060 // While a JS message dialog is showing, tabs in the same process shouldn't | 1060 // While a JS message dialog is showing, tabs in the same process shouldn't |
| 1061 // process input events. | 1061 // process input events. |
| 1062 process()->SetIgnoreInputEvents(true); | 1062 process()->SetIgnoreInputEvents(true); |
| 1063 StopHangMonitorTimeout(); | 1063 StopHangMonitorTimeout(); |
| 1064 delegate_->RunJavaScriptMessage(this, message, default_prompt, frame_url, | 1064 delegate_->RunJavaScriptMessage(this, message, default_prompt, frame_url, |
| 1065 flags, reply_msg, | 1065 static_cast<ui::JavascriptMessageType>(flags), |
|
sky
2011/12/01 16:42:02
Use a param trait so that you don't have to cast.
tfarina
2011/12/01 17:52:58
Done.
| |
| 1066 reply_msg, | |
| 1066 &are_javascript_messages_suppressed_); | 1067 &are_javascript_messages_suppressed_); |
| 1067 } | 1068 } |
| 1068 | 1069 |
| 1069 void RenderViewHost::OnMsgRunBeforeUnloadConfirm(const GURL& frame_url, | 1070 void RenderViewHost::OnMsgRunBeforeUnloadConfirm(const GURL& frame_url, |
| 1070 const string16& message, | 1071 const string16& message, |
| 1071 IPC::Message* reply_msg) { | 1072 IPC::Message* reply_msg) { |
| 1072 // While a JS before unload dialog is showing, tabs in the same process | 1073 // While a JS before unload dialog is showing, tabs in the same process |
| 1073 // shouldn't process input events. | 1074 // shouldn't process input events. |
| 1074 process()->SetIgnoreInputEvents(true); | 1075 process()->SetIgnoreInputEvents(true); |
| 1075 StopHangMonitorTimeout(); | 1076 StopHangMonitorTimeout(); |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1502 | 1503 |
| 1503 void RenderViewHost::OnWebUISend(const GURL& source_url, | 1504 void RenderViewHost::OnWebUISend(const GURL& source_url, |
| 1504 const std::string& name, | 1505 const std::string& name, |
| 1505 const base::ListValue& args) { | 1506 const base::ListValue& args) { |
| 1506 delegate_->WebUISend(this, source_url, name, args); | 1507 delegate_->WebUISend(this, source_url, name, args); |
| 1507 } | 1508 } |
| 1508 | 1509 |
| 1509 void RenderViewHost::ClearPowerSaveBlockers() { | 1510 void RenderViewHost::ClearPowerSaveBlockers() { |
| 1510 STLDeleteValues(&power_save_blockers_); | 1511 STLDeleteValues(&power_save_blockers_); |
| 1511 } | 1512 } |
| OLD | NEW |