Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index ba8328b3f46d9db08534258fe2a789364e4eaddf..2f43255af937384984bd50a3880cb39e789430f1 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -297,8 +297,6 @@ |
'browser/browser_main_posix.h', |
'browser/browser_main_win.cc', |
'browser/browser_main_win.h', |
- 'browser/browser_prefs.cc', |
- 'browser/browser_prefs.h', |
'browser/browser_process.cc', |
'browser/browser_process.h', |
'browser/browser_process_impl.cc', |
@@ -1102,8 +1100,8 @@ |
'browser/cocoa/wrench_menu_button_cell.mm', |
'browser/cocoa/wrench_menu_controller.h', |
'browser/cocoa/wrench_menu_controller.mm', |
- 'browser/command_line_pref_store.cc', |
- 'browser/command_line_pref_store.h', |
+ 'browser/prefs/command_line_pref_store.cc', |
+ 'browser/prefs/command_line_pref_store.h', |
Pam (message me for reviews)
2010/08/25 21:14:12
These should be re-sorted.
|
'browser/command_updater.cc', |
'browser/command_updater.h', |
'browser/content_exceptions_table_model.cc', |
@@ -1975,8 +1973,8 @@ |
'browser/login_prompt_win.cc', |
'browser/mach_broker_mac.cc', |
'browser/mach_broker_mac.h', |
- 'browser/managed_prefs_banner_base.cc', |
- 'browser/managed_prefs_banner_base.h', |
+ 'browser/policy/managed_prefs_banner_base.cc', |
+ 'browser/policy/managed_prefs_banner_base.h', |
Pam (message me for reviews)
2010/08/25 21:14:12
Ditto.
|
'browser/memory_details.cc', |
'browser/memory_details_linux.cc', |
'browser/memory_details_mac.cc', |
@@ -2185,18 +2183,24 @@ |
'browser/power_save_blocker_common.cc', |
'browser/power_save_blocker_stub.cc', |
'browser/power_save_blocker_win.cc', |
- 'browser/pref_member.cc', |
- 'browser/pref_member.h', |
- 'browser/pref_notifier.cc', |
- 'browser/pref_notifier.h', |
- 'browser/pref_service.cc', |
- 'browser/pref_service.h', |
- 'browser/pref_set_observer.cc', |
- 'browser/pref_set_observer.h', |
- 'browser/pref_value_store.cc', |
- 'browser/pref_value_store.h', |
'browser/preferences_mac.cc', |
'browser/preferences_mac.h', |
Pam (message me for reviews)
2010/08/25 21:14:12
Should these two be moved into prefs/ too?
|
+ 'browser/prefs/browser_prefs.cc', |
+ 'browser/prefs/browser_prefs.h', |
+ 'browser/prefs/pref_member.cc', |
+ 'browser/prefs/pref_member.h', |
+ 'browser/prefs/pref_notifier.cc', |
+ 'browser/prefs/pref_notifier.h', |
+ 'browser/prefs/pref_service.cc', |
+ 'browser/prefs/pref_service.h', |
+ 'browser/prefs/pref_set_observer.cc', |
+ 'browser/prefs/pref_set_observer.h', |
+ 'browser/prefs/pref_value_store.cc', |
+ 'browser/prefs/pref_value_store.h', |
+ 'browser/prefs/scoped_pref_update.cc', |
+ 'browser/prefs/scoped_pref_update.h', |
+ 'browser/prefs/session_startup_pref.cc', |
+ 'browser/prefs/session_startup_pref.h', |
'browser/printing/print_dialog_gtk.cc', |
'browser/printing/print_dialog_gtk.h', |
'browser/printing/print_dialog_cloud.cc', |
@@ -2374,8 +2378,6 @@ |
'browser/safe_browsing/safe_browsing_store_sqlite.h', |
'browser/safe_browsing/safe_browsing_util.cc', |
'browser/safe_browsing/safe_browsing_util.h', |
- 'browser/scoped_pref_update.cc', |
- 'browser/scoped_pref_update.h', |
'browser/search_engines/edit_search_engine_controller.cc', |
'browser/search_engines/edit_search_engine_controller.h', |
'browser/search_engines/keyword_editor_controller.cc', |
@@ -2400,8 +2402,6 @@ |
'browser/service/service_process_control_manager.h', |
'browser/service/service_process_control.cc', |
'browser/service/service_process_control.h', |
- 'browser/session_startup_pref.cc', |
- 'browser/session_startup_pref.h', |
'browser/sessions/base_session_service.cc', |
'browser/sessions/base_session_service.h', |
'browser/sessions/session_backend.cc', |