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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.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 "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 void RenderViewHostImpl::OnMsgRouteMessageEvent( 1281 void RenderViewHostImpl::OnMsgRouteMessageEvent(
1282 const ViewMsg_PostMessage_Params& params) { 1282 const ViewMsg_PostMessage_Params& params) {
1283 // Give to the delegate to route to the active RenderViewHost. 1283 // Give to the delegate to route to the active RenderViewHost.
1284 delegate_->RouteMessageEvent(this, params); 1284 delegate_->RouteMessageEvent(this, params);
1285 } 1285 }
1286 1286
1287 void RenderViewHostImpl::OnMsgRunJavaScriptMessage( 1287 void RenderViewHostImpl::OnMsgRunJavaScriptMessage(
1288 const string16& message, 1288 const string16& message,
1289 const string16& default_prompt, 1289 const string16& default_prompt,
1290 const GURL& frame_url, 1290 const GURL& frame_url,
1291 ui::JavascriptMessageType type, 1291 content::JavaScriptMessageType type,
1292 IPC::Message* reply_msg) { 1292 IPC::Message* reply_msg) {
1293 // While a JS message dialog is showing, tabs in the same process shouldn't 1293 // While a JS message dialog is showing, tabs in the same process shouldn't
1294 // process input events. 1294 // process input events.
1295 GetProcess()->SetIgnoreInputEvents(true); 1295 GetProcess()->SetIgnoreInputEvents(true);
1296 StopHangMonitorTimeout(); 1296 StopHangMonitorTimeout();
1297 delegate_->RunJavaScriptMessage(this, message, default_prompt, frame_url, 1297 delegate_->RunJavaScriptMessage(this, message, default_prompt, frame_url,
1298 type, reply_msg, 1298 type, reply_msg,
1299 &are_javascript_messages_suppressed_); 1299 &are_javascript_messages_suppressed_);
1300 } 1300 }
1301 1301
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
1837 // can cause navigations to be ignored in OnMsgNavigate. 1837 // can cause navigations to be ignored in OnMsgNavigate.
1838 is_waiting_for_beforeunload_ack_ = false; 1838 is_waiting_for_beforeunload_ack_ = false;
1839 is_waiting_for_unload_ack_ = false; 1839 is_waiting_for_unload_ack_ = false;
1840 } 1840 }
1841 1841
1842 void RenderViewHostImpl::ClearPowerSaveBlockers() { 1842 void RenderViewHostImpl::ClearPowerSaveBlockers() {
1843 STLDeleteValues(&power_save_blockers_); 1843 STLDeleteValues(&power_save_blockers_);
1844 } 1844 }
1845 1845
1846 } // namespace content 1846 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698