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

Unified Diff: chrome/chrome_browser.gypi

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolved conflicts. Created 9 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/mediaplayer_ui.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c176df26c8dcca00940f824c6bb049a278a050be..e02aa7686be0493d0daf371e0a9d505c0be38f53 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -416,6 +416,8 @@
'browser/chromeos/enterprise_extension_observer.h',
'browser/chromeos/extensions/file_browser_event_router.cc',
'browser/chromeos/extensions/file_browser_event_router.h',
+ 'browser/chromeos/extensions/media_player_event_router.cc',
+ 'browser/chromeos/extensions/media_player_event_router.h',
'browser/chromeos/external_metrics.cc',
'browser/chromeos/external_metrics.h',
'browser/chromeos/external_protocol_dialog.cc',
@@ -619,6 +621,8 @@
'browser/chromeos/login/wizard_screen.h',
'browser/chromeos/low_battery_observer.cc',
'browser/chromeos/low_battery_observer.h',
+ 'browser/chromeos/media/media_player.cc',
+ 'browser/chromeos/media/media_player.h',
'browser/chromeos/metrics_cros_settings_provider.cc',
'browser/chromeos/metrics_cros_settings_provider.h',
'browser/chromeos/name_value_pairs_parser.cc',
@@ -958,6 +962,8 @@
'browser/extensions/extension_management_api.h',
'browser/extensions/extension_menu_manager.cc',
'browser/extensions/extension_menu_manager.h',
+ 'browser/extensions/extension_mediaplayer_private_api.h',
+ 'browser/extensions/extension_mediaplayer_private_api.cc',
'browser/extensions/extension_message_handler.cc',
'browser/extensions/extension_message_handler.h',
'browser/extensions/extension_message_service.cc',
@@ -3341,8 +3347,6 @@
'browser/ui/webui/html_dialog_ui.h',
'browser/ui/webui/keyboard_ui.cc',
'browser/ui/webui/keyboard_ui.h',
- 'browser/ui/webui/mediaplayer_ui.cc',
- 'browser/ui/webui/mediaplayer_ui.h',
'browser/ui/webui/net_internals_ui.cc',
'browser/ui/webui/net_internals_ui.h',
'browser/ui/webui/ntp/app_launcher_handler.cc',
@@ -3552,6 +3556,8 @@
['exclude', '^browser/ui/webui/options/chromeos'],
['exclude', 'browser/extensions/extension_file_browser_private_api.cc'],
['exclude', 'browser/extensions/extension_file_browser_private_api.h'],
+ ['exclude', 'browser/extensions/extension_mediaplayer_private_api.cc'],
+ ['exclude', 'browser/extensions/extension_mediaplayer_private_api.h'],
['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
['exclude', 'browser/extensions/file_manager_util.h'],
['exclude', 'browser/extensions/file_manager_util.cc'],
@@ -3575,7 +3581,6 @@
['exclude', 'browser/ui/webui/cookies_tree_model_adapter.h'],
['exclude', 'browser/ui/webui/fileicon_source_cros.cc'],
['exclude', 'browser/ui/webui/fileicon_source_cros.h'],
- ['exclude', 'browser/ui/webui/mediaplayer_ui.cc'],
],
}],
['chromeos==1', {
« no previous file with comments | « chrome/browser/ui/webui/mediaplayer_ui.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698