Index: chrome/browser/extensions/extension_function_registry.cc |
diff --git a/chrome/browser/extensions/extension_function_registry.cc b/chrome/browser/extensions/extension_function_registry.cc |
index 2dd60242935239e258c70b7363d57e9222edfefc..ea979f3f1e6f927543620d2c7f5953f1331fa642 100644 |
--- a/chrome/browser/extensions/extension_function_registry.cc |
+++ b/chrome/browser/extensions/extension_function_registry.cc |
@@ -65,11 +65,14 @@ |
#include "chrome/browser/chromeos/extensions/input_method_api.h" |
#include "chrome/browser/chromeos/extensions/power/power_api.h" |
#include "chrome/browser/chromeos/extensions/wallpaper_private_api.h" |
-#include "chrome/browser/chromeos/media/media_player_extension_api.h" |
#include "chrome/browser/extensions/api/input_ime/input_ime_api.h" |
#include "chrome/browser/extensions/api/terminal/terminal_private_api.h" |
#endif |
+#if defined(OS_CHROMEOS) && defined(FILE_MANAGER_EXTENSION) |
+#include "chrome/browser/chromeos/extensions/media_player_api.h" |
+#endif |
+ |
// static |
ExtensionFunctionRegistry* ExtensionFunctionRegistry::GetInstance() { |
return Singleton<ExtensionFunctionRegistry>::get(); |
@@ -388,11 +391,13 @@ void ExtensionFunctionRegistry::ResetFunctions() { |
// FileBrowserHandler. |
RegisterFunction<FileHandlerSelectFileFunction>(); |
+#if defined(FILE_MANAGER_EXTENSION) |
// Mediaplayer |
- RegisterFunction<PlayMediaplayerFunction>(); |
- RegisterFunction<GetPlaylistMediaplayerFunction>(); |
- RegisterFunction<SetWindowHeightMediaplayerFunction>(); |
- RegisterFunction<CloseWindowMediaplayerFunction>(); |
+ RegisterFunction<extensions::PlayMediaplayerFunction>(); |
+ RegisterFunction<extensions::GetPlaylistMediaplayerFunction>(); |
+ RegisterFunction<extensions::SetWindowHeightMediaplayerFunction>(); |
+ RegisterFunction<extensions::CloseWindowMediaplayerFunction>(); |
+#endif |
// WallpaperManagerPrivate functions. |
RegisterFunction<WallpaperStringsFunction>(); |