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

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

Issue 251103: Move MediaPlayerAction to WebMediaPlayerAction. Switch to an enum and a... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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 | Annotate | Revision Log
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/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #endif 48 #endif
49 49
50 using base::TimeDelta; 50 using base::TimeDelta;
51 using webkit_glue::PasswordFormDomManager; 51 using webkit_glue::PasswordFormDomManager;
52 using WebKit::WebConsoleMessage; 52 using WebKit::WebConsoleMessage;
53 using WebKit::WebDragOperation; 53 using WebKit::WebDragOperation;
54 using WebKit::WebDragOperationNone; 54 using WebKit::WebDragOperationNone;
55 using WebKit::WebDragOperationsMask; 55 using WebKit::WebDragOperationsMask;
56 using WebKit::WebFindOptions; 56 using WebKit::WebFindOptions;
57 using WebKit::WebInputEvent; 57 using WebKit::WebInputEvent;
58 using WebKit::WebMediaPlayerAction;
58 using WebKit::WebTextDirection; 59 using WebKit::WebTextDirection;
59 60
60 namespace { 61 namespace {
61 62
62 void FilterURL(ChildProcessSecurityPolicy* policy, int renderer_id, GURL* url) { 63 void FilterURL(ChildProcessSecurityPolicy* policy, int renderer_id, GURL* url) {
63 if (!url->is_valid()) 64 if (!url->is_valid())
64 return; // We don't need to block invalid URLs. 65 return; // We don't need to block invalid URLs.
65 66
66 if (url->SchemeIs(chrome::kAboutScheme)) { 67 if (url->SchemeIs(chrome::kAboutScheme)) {
67 // The renderer treats all URLs in the about: scheme as being about:blank. 68 // The renderer treats all URLs in the about: scheme as being about:blank.
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1332 delegate_->RunBeforeUnloadConfirm(message, reply_msg); 1333 delegate_->RunBeforeUnloadConfirm(message, reply_msg);
1333 } 1334 }
1334 1335
1335 void RenderViewHost::OnMsgShowModalHTMLDialog( 1336 void RenderViewHost::OnMsgShowModalHTMLDialog(
1336 const GURL& url, int width, int height, const std::string& json_arguments, 1337 const GURL& url, int width, int height, const std::string& json_arguments,
1337 IPC::Message* reply_msg) { 1338 IPC::Message* reply_msg) {
1338 StopHangMonitorTimeout(); 1339 StopHangMonitorTimeout();
1339 delegate_->ShowModalHTMLDialog(url, width, height, json_arguments, reply_msg); 1340 delegate_->ShowModalHTMLDialog(url, width, height, json_arguments, reply_msg);
1340 } 1341 }
1341 1342
1342 void RenderViewHost::MediaPlayerActionAt(int x, 1343 void RenderViewHost::MediaPlayerActionAt(const gfx::Point& location,
1343 int y, 1344 const WebMediaPlayerAction& action) {
1344 const MediaPlayerAction& action) {
1345 // TODO(ajwong): Which thread should run this? Does it matter? 1345 // TODO(ajwong): Which thread should run this? Does it matter?
1346 Send(new ViewMsg_MediaPlayerActionAt(routing_id(), x, y, action)); 1346 Send(new ViewMsg_MediaPlayerActionAt(routing_id(), location, action));
1347 } 1347 }
1348 1348
1349 void RenderViewHost::OnMsgPasswordFormsSeen( 1349 void RenderViewHost::OnMsgPasswordFormsSeen(
1350 const std::vector<webkit_glue::PasswordForm>& forms) { 1350 const std::vector<webkit_glue::PasswordForm>& forms) {
1351 delegate_->PasswordFormsSeen(forms); 1351 delegate_->PasswordFormsSeen(forms);
1352 } 1352 }
1353 1353
1354 void RenderViewHost::OnMsgAutofillFormSubmitted( 1354 void RenderViewHost::OnMsgAutofillFormSubmitted(
1355 const webkit_glue::AutofillForm& form) { 1355 const webkit_glue::AutofillForm& form) {
1356 RenderViewHostDelegate::Autofill* autofill_delegate = 1356 RenderViewHostDelegate::Autofill* autofill_delegate =
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 #endif 1701 #endif
1702 } 1702 }
1703 1703
1704 void RenderViewHost::OnCSSInserted() { 1704 void RenderViewHost::OnCSSInserted() {
1705 delegate_->DidInsertCSS(); 1705 delegate_->DidInsertCSS();
1706 } 1706 }
1707 1707
1708 void RenderViewHost::UpdateBrowserWindowId(int window_id) { 1708 void RenderViewHost::UpdateBrowserWindowId(int window_id) {
1709 Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id)); 1709 Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id));
1710 } 1710 }
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