summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 05:50:28 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 05:50:28 +0000
commit952cb7063b41fc2afaa9d1c265d38158b0e7d3e0 (patch)
treea454f8e01ee6ce946e475f8451ba4e1fd1407007 /chrome/renderer
parent71cd6a943b2b677adabbafdd12b2e024106e78f6 (diff)
downloadchromium_src-952cb7063b41fc2afaa9d1c265d38158b0e7d3e0.zip
chromium_src-952cb7063b41fc2afaa9d1c265d38158b0e7d3e0.tar.gz
chromium_src-952cb7063b41fc2afaa9d1c265d38158b0e7d3e0.tar.bz2
Move MediaPlayerAction to WebMediaPlayerAction. Switch to an enum and a
boolean to express the action. R=ajwong BUG=10033 TEST=none Review URL: http://codereview.chromium.org/251103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/render_view.cc12
-rw-r--r--chrome/renderer/render_view.h5
2 files changed, 7 insertions, 10 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 7afabfe..a6c8cb5 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -123,6 +123,7 @@ using WebKit::WebForm;
using WebKit::WebFrame;
using WebKit::WebHistoryItem;
using WebKit::WebMediaPlayer;
+using WebKit::WebMediaPlayerAction;
using WebKit::WebMediaPlayerClient;
using WebKit::WebNavigationPolicy;
using WebKit::WebNavigationType;
@@ -3032,13 +3033,10 @@ void RenderView::OnSetRendererPrefs(const RendererPreferences& renderer_prefs) {
#endif
}
-void RenderView::OnMediaPlayerActionAt(int x,
- int y,
- const MediaPlayerAction& action) {
- if (!webview())
- return;
-
- webview()->MediaPlayerActionAt(x, y, action);
+void RenderView::OnMediaPlayerActionAt(const gfx::Point& location,
+ const WebMediaPlayerAction& action) {
+ if (webview())
+ webview()->performMediaPlayerAction(action, location);
}
void RenderView::OnNotifyRendererViewType(ViewType::Type type) {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 266a8ed..42237b8 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -609,9 +609,8 @@ class RenderView : public RenderWidget,
void OnEnableViewSourceMode();
void OnEnableIntrinsicWidthChangedMode();
void OnSetRendererPrefs(const RendererPreferences& renderer_prefs);
- void OnMediaPlayerActionAt(int x,
- int y,
- const MediaPlayerAction& action);
+ void OnMediaPlayerActionAt(const gfx::Point& location,
+ const WebKit::WebMediaPlayerAction& action);
void OnNotifyRendererViewType(ViewType::Type view_type);
void OnUpdateBrowserWindowId(int window_id);
void OnExecuteCode(int request_id,