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

Side by Side Diff: chrome/browser/renderer_host/render_view_host.cc

Issue 159471: Merge 21466 - Allow the browser to send actions back to the render for media ... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 5 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
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/browser/renderer_host/render_view_host.cc:r21466
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/renderer_host/render_view_host.h" 5 #include "chrome/browser/renderer_host/render_view_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 } 1234 }
1235 1235
1236 void RenderViewHost::OnMsgShowModalHTMLDialog( 1236 void RenderViewHost::OnMsgShowModalHTMLDialog(
1237 const GURL& url, int width, int height, const std::string& json_arguments, 1237 const GURL& url, int width, int height, const std::string& json_arguments,
1238 IPC::Message* reply_msg) { 1238 IPC::Message* reply_msg) {
1239 StopHangMonitorTimeout(); 1239 StopHangMonitorTimeout();
1240 SignalModalDialogEvent(); 1240 SignalModalDialogEvent();
1241 delegate_->ShowModalHTMLDialog(url, width, height, json_arguments, reply_msg); 1241 delegate_->ShowModalHTMLDialog(url, width, height, json_arguments, reply_msg);
1242 } 1242 }
1243 1243
1244 void RenderViewHost::MediaPlayerActionAt(int x,
1245 int y,
1246 const MediaPlayerAction& action) {
1247 // TODO(ajwong): Which thread should run this? Does it matter?
1248 Send(new ViewMsg_MediaPlayerActionAt(routing_id(), x, y, action));
1249 }
1250
1244 void RenderViewHost::OnMsgPasswordFormsSeen( 1251 void RenderViewHost::OnMsgPasswordFormsSeen(
1245 const std::vector<webkit_glue::PasswordForm>& forms) { 1252 const std::vector<webkit_glue::PasswordForm>& forms) {
1246 delegate_->PasswordFormsSeen(forms); 1253 delegate_->PasswordFormsSeen(forms);
1247 } 1254 }
1248 1255
1249 void RenderViewHost::OnMsgAutofillFormSubmitted( 1256 void RenderViewHost::OnMsgAutofillFormSubmitted(
1250 const webkit_glue::AutofillForm& form) { 1257 const webkit_glue::AutofillForm& form) {
1251 RenderViewHostDelegate::Autofill* autofill_delegate = 1258 RenderViewHostDelegate::Autofill* autofill_delegate =
1252 delegate_->GetAutofillDelegate(); 1259 delegate_->GetAutofillDelegate();
1253 if (autofill_delegate) 1260 if (autofill_delegate)
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
1569 1576
1570 void RenderViewHost::SignalModalDialogEvent() { 1577 void RenderViewHost::SignalModalDialogEvent() {
1571 if (modal_dialog_count_++ == 0) 1578 if (modal_dialog_count_++ == 0)
1572 modal_dialog_event_->Signal(); 1579 modal_dialog_event_->Signal();
1573 } 1580 }
1574 1581
1575 void RenderViewHost::ResetModalDialogEvent() { 1582 void RenderViewHost::ResetModalDialogEvent() {
1576 if (--modal_dialog_count_ == 0) 1583 if (--modal_dialog_count_ == 0)
1577 modal_dialog_event_->Reset(); 1584 modal_dialog_event_->Reset();
1578 } 1585 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/render_view_host.h ('k') | chrome/browser/tab_contents/render_view_context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698