Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index 3f969b7fe3611678313fff1c9355dc36a9579779..bc0d2fe984c6d56c9892a1bf744d4cf5d7bddced 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -616,18 +616,18 @@ |
# TODO(brettw) should this go with the webrtc sources? |
'browser/media/webrtc_log_list.cc', |
'browser/media/webrtc_log_list.h', |
+ 'browser/memory/oom_memory_details.cc', |
+ 'browser/memory/oom_memory_details.h', |
+ 'browser/memory/oom_priority_manager.h', |
+ 'browser/memory/oom_priority_manager_chromeos.cc', |
+ 'browser/memory/system_memory_stats_recorder.h', |
+ 'browser/memory/system_memory_stats_recorder_linux.cc', |
'browser/memory_details.cc', |
'browser/memory_details.h', |
'browser/memory_details_android.cc', |
'browser/memory_details_linux.cc', |
'browser/memory_details_mac.cc', |
'browser/memory_details_win.cc', |
- 'browser/memory/oom_memory_details.cc', |
- 'browser/memory/oom_memory_details.h', |
- 'browser/memory/oom_priority_manager_chromeos.cc', |
- 'browser/memory/oom_priority_manager.h', |
- 'browser/memory/system_memory_stats_recorder_linux.cc', |
- 'browser/memory/system_memory_stats_recorder.h', |
'browser/mod_pagespeed/mod_pagespeed_metrics.cc', |
'browser/mod_pagespeed/mod_pagespeed_metrics.h', |
'browser/native_window_notification_source.h', |
@@ -1024,10 +1024,10 @@ |
'browser/download/download_shelf_context_menu.h', |
'browser/download/notification/download_group_notification.cc', |
'browser/download/notification/download_group_notification.h', |
- 'browser/download/notification/download_notification.cc', |
- 'browser/download/notification/download_notification.h', |
'browser/download/notification/download_item_notification.cc', |
'browser/download/notification/download_item_notification.h', |
+ 'browser/download/notification/download_notification.cc', |
+ 'browser/download/notification/download_notification.h', |
'browser/download/notification/download_notification_manager.cc', |
'browser/download/notification/download_notification_manager.h', |
'browser/feedback/feedback_profile_observer.cc', |
@@ -2268,10 +2268,6 @@ |
'browser/prefs/pref_service_syncable_observer.h', |
'browser/prefs/profile_pref_store_manager.cc', |
'browser/prefs/profile_pref_store_manager.h', |
- 'browser/prefs/proxy_config_dictionary.cc', |
- 'browser/prefs/proxy_config_dictionary.h', |
- 'browser/prefs/proxy_prefs.cc', |
- 'browser/prefs/proxy_prefs.h', |
'browser/prefs/session_startup_pref.cc', |
'browser/prefs/session_startup_pref.h', |
'browser/prefs/synced_pref_change_registrar.cc', |
@@ -2346,9 +2342,9 @@ |
'browser/printing/cloud_print/cloud_print_proxy_service_factory.cc', |
'browser/printing/cloud_print/cloud_print_proxy_service_factory.h', |
'browser/printing/print_dialog_cloud.cc', |
- 'browser/printing/print_dialog_cloud_win.cc', |
- 'browser/printing/print_dialog_cloud_posix.cc', |
'browser/printing/print_dialog_cloud.h', |
+ 'browser/printing/print_dialog_cloud_posix.cc', |
+ 'browser/printing/print_dialog_cloud_win.cc', |
'browser/printing/print_error_dialog.cc', |
'browser/printing/print_error_dialog.h', |
'browser/printing/print_preview_context_menu_observer.cc', |
@@ -3158,6 +3154,7 @@ |
'../components/components.gyp:password_manager_core_browser', |
'../components/components.gyp:password_manager_core_common', |
'../components/components.gyp:policy_component', |
+ '../components/components.gyp:proxy_config', |
'../components/components.gyp:query_parser', |
'../components/components.gyp:rappor', |
'../components/components.gyp:renderer_context_menu', |