Move MediaPlayerAction to WebMediaPlayerAction. Switch to an enum and a...

chrome/browser/tab_contents/render_view_context_menu.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/spellchecker.h"
 #include "chrome/browser/spellchecker_platform_engine.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/platform_util.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
-#include "webkit/glue/media_player_action.h"
+#include "webkit/api/public/WebMediaPlayerAction.h"
+
+using WebKit::WebMediaPlayerAction;
 
 namespace {
 
 string16 EscapeAmpersands(const string16& text) {
   string16 ret;
   ret.reserve(text.length() * 2);
   for (string16::const_iterator i = text.begin();
        i != text.end(); ++i) {
     // The escape for an ampersand is two ampersands.
     if ('&' == *i)
@@ skipping 493 matching lines @@
       break;
 
     case IDS_CONTENT_CONTEXT_OPENAUDIONEWTAB:
     case IDS_CONTENT_CONTEXT_OPENVIDEONEWTAB:
     case IDS_CONTENT_CONTEXT_OPENIMAGENEWTAB:
       OpenURL(params_.src_url, NEW_BACKGROUND_TAB, PageTransition::LINK);
       break;
 
     case IDS_CONTENT_CONTEXT_PLAY:
       UserMetrics::RecordAction(L"MediaContextMenu_Play", profile_);
-      MediaPlayerActionAt(params_.x,
-                          params_.y,
-                          MediaPlayerAction(MediaPlayerAction::PLAY));
+      MediaPlayerActionAt(gfx::Point(params_.x, params_.y),
+                          WebMediaPlayerAction(
+                              WebMediaPlayerAction::Play, true));
       break;
 
     case IDS_CONTENT_CONTEXT_PAUSE:
       UserMetrics::RecordAction(L"MediaContextMenu_Pause", profile_);
-      MediaPlayerActionAt(params_.x,
-                          params_.y,
-                          MediaPlayerAction(MediaPlayerAction::PAUSE));
+      MediaPlayerActionAt(gfx::Point(params_.x, params_.y),
+                          WebMediaPlayerAction(
+                              WebMediaPlayerAction::Play, false));
       break;
 
     case IDS_CONTENT_CONTEXT_MUTE:
       UserMetrics::RecordAction(L"MediaContextMenu_Mute", profile_);
-      MediaPlayerActionAt(params_.x,
-                        params_.y,
-                        MediaPlayerAction(MediaPlayerAction::MUTE));
+      MediaPlayerActionAt(gfx::Point(params_.x, params_.y),
+                          WebMediaPlayerAction(
+                              WebMediaPlayerAction::Mute, true));
       break;
 
     case IDS_CONTENT_CONTEXT_UNMUTE:
       UserMetrics::RecordAction(L"MediaContextMenu_Unmute", profile_);
-      MediaPlayerActionAt(params_.x,
-                          params_.y,
-                          MediaPlayerAction(MediaPlayerAction::UNMUTE));
+      MediaPlayerActionAt(gfx::Point(params_.x, params_.y),
+                          WebMediaPlayerAction(
+                              WebMediaPlayerAction::Mute, false));
       break;
 
     case IDS_CONTENT_CONTEXT_LOOP:
       UserMetrics::RecordAction(L"MediaContextMenu_Loop", profile_);
-      if (ItemIsChecked(IDS_CONTENT_CONTEXT_LOOP)) {
-        MediaPlayerActionAt(params_.x,
-                            params_.y,
-                            MediaPlayerAction(MediaPlayerAction::NO_LOOP));
-      } else {
-        MediaPlayerActionAt(params_.x,
-                            params_.y,
-                            MediaPlayerAction(MediaPlayerAction::LOOP));
-      }
+      MediaPlayerActionAt(gfx::Point(params_.x, params_.y),
+                          WebMediaPlayerAction(
+                              WebMediaPlayerAction::Loop,
+                              !ItemIsChecked(IDS_CONTENT_CONTEXT_LOOP)));
       break;
 
     case IDS_CONTENT_CONTEXT_BACK:
       source_tab_contents_->controller().GoBack();
       break;
 
     case IDS_CONTENT_CONTEXT_FORWARD:
       source_tab_contents_->controller().GoForward();
       break;
 
@@ skipping 209 matching lines @@
 }
 
 void RenderViewContextMenu::WriteURLToClipboard(const GURL& url) {
   chrome_browser_net::WriteURLToClipboard(
       url,
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
       g_browser_process->clipboard());
 }
 
 void RenderViewContextMenu::MediaPlayerActionAt(
-    int x,
-    int y,
-    const MediaPlayerAction& action) {
-  source_tab_contents_->render_view_host()->MediaPlayerActionAt(x, y, action);
+    const gfx::Point& location,
+    const WebMediaPlayerAction& action) {
+  source_tab_contents_->render_view_host()->MediaPlayerActionAt(
+      location, action);
 }