7 files changed, 36 insertions, 23 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index ac1fb8d..75d02c0 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -28,6 +28,7 @@
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
+#include "webkit/glue/media_player_action.h"
 
 RenderViewContextMenu::RenderViewContextMenu(
     TabContents* tab_contents,
diff --git a/chrome/browser/tab_contents/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h
index 93c554d..8e0f199 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.h
+++ b/chrome/browser/tab_contents/render_view_context_menu.h
@@ -12,6 +12,7 @@
 
 class Profile;
 class TabContents;
+struct MediaPlayerAction;
 
 class RenderViewContextMenu {
  public:
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index f89bcf4..ee8c751 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -32,6 +32,7 @@
 #include "webkit/glue/autofill_form.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/form_data.h"
+#include "webkit/glue/media_player_action.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/resource_loader_bridge.h"
diff --git a/webkit/glue/context_menu.h b/webkit/glue/context_menu.h
index 975ad275..bdeba6c 100644
--- a/webkit/glue/context_menu.h
+++ b/webkit/glue/context_menu.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_CONTEXT_NODE_TYPES_H__
-#define WEBKIT_GLUE_CONTEXT_NODE_TYPES_H__
+#ifndef WEBKIT_GLUE_CONTEXT_MENU_H_
+#define WEBKIT_GLUE_CONTEXT_MENU_H_
 
 #include <vector>
 
@@ -154,23 +154,4 @@ struct ContextMenuParams {
   std::string frame_charset;
 };
 
-struct MediaPlayerAction {
-  enum CommandTypeBit {
-    NONE = 0x0,
-    PLAY = 0x1,
-    PAUSE = 0x2,
-    MUTE = 0x4,
-    UNMUTE = 0x8,
-    LOOP = 0x10,
-    NO_LOOP = 0x20,
-  };
-
-  // A bitfield representing the actions that the context menu should execute
-  // on the originating node.
-  int32 command;
-
-  MediaPlayerAction() : command(NONE) {}
-  explicit MediaPlayerAction(int c) : command(c) {}
-};
-
-#endif  // WEBKIT_GLUE_CONTEXT_NODE_TYPES_H__
+#endif  // WEBKIT_GLUE_CONTEXT_MENU_H_
diff --git a/webkit/glue/media_player_action.h b/webkit/glue/media_player_action.h
new file mode 100644
index 0000000..b4506fd
--- /dev/null
+++ b/webkit/glue/media_player_action.h
@@ -0,0 +1,28 @@
+// 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.
+
+#ifndef WEBKIT_GLUE_MEDIA_PLAYER_ACTION_H_
+#define WEBKIT_GLUE_MEDIA_PLAYER_ACTION_H_
+
+// Commands that can be sent to the MediaPlayer via a WebView.
+struct MediaPlayerAction {
+  enum CommandTypeBit {
+    NONE = 0x0,
+    PLAY = 0x1,
+    PAUSE = 0x2,
+    MUTE = 0x4,
+    UNMUTE = 0x8,
+    LOOP = 0x10,
+    NO_LOOP = 0x20,
+  };
+
+  // A bitfield representing the actions that the context menu should execute
+  // on the originating node.
+  int32 command;
+
+  MediaPlayerAction() : command(NONE) {}
+  explicit MediaPlayerAction(int c) : command(c) {}
+};
+
+#endif  // WEBKIT_GLUE_MEDIA_PLAYER_ACTION_H_
diff --git a/webkit/glue/webview.h b/webkit/glue/webview.h
index 4b9c098..42334b1 100644
--- a/webkit/glue/webview.h
+++ b/webkit/glue/webview.h
@@ -18,10 +18,10 @@ class WebSettings;
 struct WebPoint;
 }
 
-struct MediaPlayerAction;
 class GURL;
 class WebDevToolsAgent;
 class WebViewDelegate;
+struct MediaPlayerAction;
 
 //
 //  @class WebView
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index aa19fcc..4b486d5 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -75,6 +75,7 @@ MSVC_POP_WARNING();
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/image_resource_fetcher.h"
 #include "webkit/glue/inspector_client_impl.h"
+#include "webkit/glue/media_player_action.h"
 #include "webkit/glue/searchable_form_data.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/webkit_glue.h"