Generate all chrome .vcproj files:

* Path name translation (/ to \) of various MSVSTool attributes.
* Explicit keyword= arguments to MSVSProject.  This will likely
  go away eventually in favor of uniform behavior.
* Add a relative_path_substitutions array that can be used
  to substitute in Visual Studio variable like $(OutDir).
* Add a local_directory_prefix that can be set to './' to only
  affect files in the current directory.
* Additional Keyword ordering in Tool attributes to continue to
  match the default order Visual Studio generates.
* Add a Derived() proxy class that can wrap a File node to tell
  the .vcproj generation that we want the derived file, not its
  source(s), in the file list.
* In the individual *.scons files, add the necessary files (mostly
  .h files) to file lists, and update MSVSProject() calls with
  the additional necessary information.

Result is identical .vcproj files modulo the following differences:

* Four locales .vcproj files (da, en-US, he and zh-TW) with
  source file orders that don't match the other locale .vcproj
  files have re-ordered file lists to match the rest.
* Cosmetic XML changes (white space, ending tags) in:
    chrome/app/chrome_dll.vcproj
    chrome/app/generated_resources.vcproj
    net/build/net_resources.vcproj
* Removal or addition of ./ prefixes from various files that don't
  match the other file specifications within their individual
  .vcproj files:
    chrome/installer/util/util.vcproj
    net/build/net.vcproj
    net/build/net_unittests.vcproj
* Add missing empty sections (<ToolFiles>, <References>, <Globals>)
  for consistency with other .vcproj files:
    chrome/tools/test/image_diff/image_diff.vcproj
    third_party/libpng/libpng.vcproj
    third_party/zlib/zlib.vcproj
* Add missing RootNameSpace attribute:
    chrome/test/automation/automation.vcproj
    testing/gtest.vcproj
* Use && instead of \r\n as a command separator, to sidestep
  XML-generation problems:
    chrome/app/chrome_exe.vcproj
* Remove unnecessary (?) duplicate files in the file list:
    chrome/browser/views/browser_views.vcproj
      (event_utils.cc and event_utils.h were duplicated)
  
Review URL: http://codereview.chromium.org/17603

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8253 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 1009 insertions, 119 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 19424c8..cd01283 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -37,105 +37,640 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = []
-
-input_files.extend([
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Autocomplete', [
+    'autocomplete/autocomplete.cc',
+    'autocomplete/autocomplete.h',
+    'autocomplete/autocomplete_accessibility.cc',
+    'autocomplete/autocomplete_accessibility.h',
+    'autocomplete/autocomplete_edit.cc',
+    'autocomplete/autocomplete_edit.h',
+    'autocomplete/autocomplete_popup.cc',
+    'autocomplete/autocomplete_popup.h',
+    'autocomplete/edit_drop_target.cc',
+    'autocomplete/edit_drop_target.h',
+    'autocomplete/history_contents_provider.cc',
+    'autocomplete/history_contents_provider.h',
+    'autocomplete/history_url_provider.cc',
+    'autocomplete/history_url_provider.h',
     'autocomplete/keyword_provider.cc',
-    'automation/automation_resource_tracker.cc',
-    'automation/url_request_failed_dns_job.cc',
-    'automation/url_request_mock_http_job.cc',
-    'automation/url_request_mock_net_error_job.cc',
-    'automation/url_request_slow_download_job.cc',
-    'bookmarks/bookmark_codec.cc',
-    'bookmarks/bookmark_html_writer.cc',
+    'autocomplete/keyword_provider.h',
+    'autocomplete/search_provider.cc',
+    'autocomplete/search_provider.h',
+  ]),
+  MSVSFilter('Base', [
+    'alternate_nav_url_fetcher.cc',
+    'alternate_nav_url_fetcher.h',
+    'browser_about_handler.cc',
+    'browser_about_handler.h',
+    'browser_init.cc',
+    'browser_init.h',
+    'browser_main.cc',
+    'browser_main_win.cc',
+    'browser_prefs.cc',
+    'browser_prefs.h',
     'browser_process.cc',
-    'browser_trial.cc',
+    'browser_process.h',
+    'browser_process_impl.cc',
+    'browser_process_impl.h',
+    'browser_resources.h',
+    'browser_shutdown.cc',
+    'browser_shutdown.h',
+    'browser_url_handler.cc',
+    'browser_url_handler.h',
+    'browsing_data_remover.cc',
+    'browsing_data_remover.h',
+    'browsing_instance.cc',
+    'browsing_instance.h',
+    'cache_manager_host.cc',
+    'cache_manager_host.h',
     'cancelable_request.cc',
-    'chrome_plugin_browsing_context.cc',
+    'cancelable_request.h',
+    'character_encoding.cc',
+    'character_encoding.h',
     'chrome_thread.cc',
+    'chrome_thread.h',
     'cross_site_request_manager.cc',
-    'dom_ui/chrome_url_data_manager.cc',
-    'download/save_file.cc',
-    'extensions/extension.cc',
-    'extensions/extensions_service.cc',
-    'extensions/user_script_master.cc',
+    'cross_site_request_manager.h',
+    'fav_icon_helper.cc',
+    'fav_icon_helper.h',
+    'first_run.cc',
+    'first_run.h',
     'google_url_tracker.cc',
+    'google_url_tracker.h',
     'google_util.cc',
+    'google_util.h',
+    'icon_loader.cc',
+    'icon_loader.h',
+    'icon_manager.cc',
+    'icon_manager.h',
+    'ime_input.cc',
+    'ime_input.h',
+    'jankometer.cc',
+    'jankometer.h',
+    'memory_details.cc',
+    'memory_details.h',
+    'meta_table_helper.cc',
+    'meta_table_helper.h',
+    'plugin_process_host.cc',
+    'plugin_process_host.h',
+    'plugin_process_info.h',
+    'plugin_service.cc',
+    'plugin_service.h',
+    '../tools/build/win/precompiled_wtl.cc',
+    '../tools/build/win/precompiled_wtl.h',
+    'profile.cc',
+    'profile.h',
+    'profile_manager.cc',
+    'profile_manager.h',
+    'render_view_host.cc',
+    'render_view_host.h',
+    'render_view_host_delegate.h',
+    'render_widget_helper.cc',
+    'render_widget_helper.h',
+    'render_widget_host.cc',
+    'render_widget_host.h',
+    'render_widget_host_view.h',
+    'render_widget_host_view_win.cc',
+    'render_widget_host_view_win.h',
+    'resource_message_filter.cc',
+    'resource_message_filter.h',
+    'resource_request_details.h',
+    'session_startup_pref.cc',
+    'session_startup_pref.h',
+    'shell_dialogs.h',
+    'shell_integration.cc',
+    'shell_integration.h',
+    'spellcheck_worditerator.cc',
+    'spellcheck_worditerator.h',
+    'spellchecker.cc',
+    'spellchecker.h',
+    'user_data_manager.cc',
+    'user_data_manager.h',
+    'visitedlink_master.cc',
+    'visitedlink_master.h',
+    'web_app.cc',
+    'web_app.h',
+    'web_app_launcher.cc',
+    'web_app_launcher.h',
+  ]),
+  MSVSFilter('Bookmarks', [
+    'bookmarks/bookmark_codec.cc',
+    'bookmarks/bookmark_codec.h',
+    'bookmarks/bookmark_context_menu.cc',
+    'bookmarks/bookmark_context_menu.h',
+    'bookmarks/bookmark_drag_data.cc',
+    'bookmarks/bookmark_drag_data.h',
+    'bookmarks/bookmark_drop_info.cc',
+    'bookmarks/bookmark_drop_info.h',
+    'bookmarks/bookmark_folder_tree_model.cc',
+    'bookmarks/bookmark_folder_tree_model.h',
+    'bookmarks/bookmark_html_writer.cc',
+    'bookmarks/bookmark_html_writer.h',
+    'bookmarks/bookmark_model.cc',
+    'bookmarks/bookmark_model.h',
+    'bookmarks/bookmark_service.h',
+    'bookmarks/bookmark_storage.cc',
+    'bookmarks/bookmark_storage.h',
+    'bookmarks/bookmark_table_model.cc',
+    'bookmarks/bookmark_table_model.h',
+    'bookmarks/bookmark_utils.cc',
+    'bookmarks/bookmark_utils.h',
+  ]),
+  MSVSFilter('Tab Contents (Old)', [
+    'render_view_context_menu.cc',
+    'render_view_context_menu.h',
+    'render_view_context_menu_controller.cc',
+    'render_view_context_menu_controller.h',
+    'render_view_host_manager.cc',
+    'render_view_host_manager.h',
+    'security_style.h',
+  ]),
+  MSVSFilter('Browser Window', [
+    'app_modal_dialog_queue.cc',
+    'app_modal_dialog_queue.h',
+    'back_forward_menu_model.cc',
+    'back_forward_menu_model.h',
+    'browser.cc',
+    'browser.h',
+    'browser_list.cc',
+    'browser_list.h',
+    'browser_window.h',
+    'controller.cc',
+    'controller.h',
+    'dock_info.cc',
+    'dock_info.h',
+    'find_notification_details.h',
+    'js_before_unload_handler.cc',
+    'js_before_unload_handler.h',
+    'jsmessage_box_handler.cc',
+    'jsmessage_box_handler.h',
+    'load_from_memory_cache_details.h',
+    'load_notification_details.h',
+    'login_prompt.cc',
+    'login_prompt.h',
+    'options_window.h',
+    'repost_form_warning_dialog.cc',
+    'repost_form_warning_dialog.h',
+    'task_manager.cc',
+    'task_manager.h',
+    'task_manager_resource_providers.cc',
+    'task_manager_resource_providers.h',
+    'web_app_icon_manager.cc',
+    'web_app_icon_manager.h',
+    'window_sizer.cc',
+    'window_sizer.h',
+  ]),
+  MSVSFilter('Policy', [
+    'renderer_security_policy.cc',
+    'renderer_security_policy.h',
+  ]),
+  MSVSFilter('Destination', [
+    'base_history_model.cc',
+    'base_history_model.h',
+    'views/download_tab_view.cc',
+    'views/download_tab_view.h',
+    'history_model.cc',
+    'history_model.h',
+    'history_view.cc',
+    'history_view.h',
+  ]),
+  MSVSFilter('Automation', [
+    'automation/automation_autocomplete_edit_tracker.h',
+    'automation/automation_browser_tracker.h',
+    'automation/automation_constrained_window_tracker.h',
+    'automation/automation_provider.cc',
+    'automation/automation_provider.h',
+    'automation/automation_provider_list.cc',
+    'automation/automation_provider_list.h',
+    'automation/automation_resource_tracker.cc',
+    'automation/automation_resource_tracker.h',
+    'automation/automation_tab_tracker.h',
+    'automation/automation_window_tracker.h',
+    'automation/ui_controls.cc',
+    'automation/ui_controls.h',
+    'automation/url_request_failed_dns_job.cc',
+    'automation/url_request_failed_dns_job.h',
+    'automation/url_request_mock_http_job.cc',
+    'automation/url_request_mock_http_job.h',
+    'automation/url_request_mock_net_error_job.cc',
+    'automation/url_request_mock_net_error_job.h',
+    'automation/url_request_slow_download_job.cc',
+    'automation/url_request_slow_download_job.h',
+    'view_ids.h',
+  ]),
+  MSVSFilter('History', [
     'history/archived_database.cc',
+    'history/archived_database.h',
     'history/download_database.cc',
+    'history/download_database.h',
+    'history/download_types.h',
     'history/expire_history_backend.cc',
+    'history/expire_history_backend.h',
+    'history/history.cc',
+    'history/history.h',
     'history/history_backend.cc',
+    'history/history_backend.h',
     'history/history_database.cc',
+    'history/history_database.h',
+    'history/history_indexer.idl',
+    'history/history_marshaling.h',
+    'history/history_notifications.h',
+    'history/history_publisher.cc',
+    'history/history_publisher.h',
     'history/history_types.cc',
+    'history/history_types.h',
     'history/in_memory_database.cc',
+    'history/in_memory_database.h',
     'history/in_memory_history_backend.cc',
+    'history/in_memory_history_backend.h',
     'history/page_usage_data.cc',
+    'history/page_usage_data.h',
     'history/query_parser.cc',
+    'history/query_parser.h',
     'history/snippet.cc',
+    'history/snippet.h',
     'history/starred_url_database.cc',
+    'history/starred_url_database.h',
     'history/text_database.cc',
+    'history/text_database.h',
     'history/text_database_manager.cc',
+    'history/text_database_manager.h',
     'history/thumbnail_database.cc',
+    'history/thumbnail_database.h',
     'history/url_database.cc',
+    'history/url_database.h',
     'history/visit_database.cc',
+    'history/visit_database.h',
     'history/visit_tracker.cc',
+    'history/visit_tracker.h',
     'history/visitsegment_database.cc',
-    'history_model.cc',
+    'history/visitsegment_database.h',
+    MSVSFilter('HangMonitor', [
+      'hang_monitor/hung_plugin_action.cc',
+      'hang_monitor/hung_plugin_action.h',
+      'hang_monitor/hung_window_detector.cc',
+      'hang_monitor/hung_window_detector.h',
+    ]),
+  ]),
+  MSVSFilter('Sessions and Tab Restore', [
+    'sessions/base_session_service.cc',
+    'sessions/base_session_service.h',
+    'sessions/session_backend.cc',
+    'sessions/session_backend.h',
+    'sessions/session_command.cc',
+    'sessions/session_command.h',
+    'sessions/session_id.cc',
+    'sessions/session_id.h',
+    'sessions/session_restore.cc',
+    'sessions/session_restore.h',
+    'sessions/session_service.cc',
+    'sessions/session_service.h',
+    'sessions/session_types.cc',
+    'sessions/session_types.h',
+    'sessions/tab_restore_service.cc',
+    'sessions/tab_restore_service.h',
+  ]),
+  MSVSFilter('WebData', [
+    'webdata/web_data_service.cc',
+    'webdata/web_data_service.h',
+    'webdata/web_database.cc',
+    'webdata/web_database.h',
+    'webdata/web_database_win.cc',
+  ]),
+  MSVSFilter('Importer', [
     'importer/firefox2_importer.cc',
+    'importer/firefox2_importer.h',
     'importer/firefox3_importer.cc',
+    'importer/firefox3_importer.h',
+    'importer/firefox_importer_utils.cc',
+    'importer/firefox_importer_utils.h',
     'importer/firefox_profile_lock.cc',
+    'importer/firefox_profile_lock.h',
+    'importer/firefox_profile_lock_win.cc',
+    'importer/ie_importer.cc',
+    'importer/ie_importer.h',
+    'importer/importer.cc',
+    'importer/importer.h',
     'importer/mork_reader.cc',
-    'meta_table_helper.cc',
-    'metrics/metrics_log.cc',
-    'metrics/metrics_response.cc',
-    'metrics/user_metrics.cc',
+    'importer/mork_reader.h',
+    'importer/toolbar_importer.cc',
+    'importer/toolbar_importer.h',
+  ]),
+  MSVSFilter('Drag & Drop', [
+    'drag_utils.cc',
+    'drag_utils.h',
+  ]),
+  MSVSFilter('Tabs', [
+    'tabs/tab_strip_model.cc',
+    'tabs/tab_strip_model.h',
+    'tabs/tab_strip_model_order_controller.cc',
+    'tabs/tab_strip_model_order_controller.h',
+  ]),
+  MSVSFilter('Printing', [
+    'printing/page_number.cc',
+    'printing/page_number.h',
+    'printing/page_overlays.cc',
+    'printing/page_overlays.h',
+    'printing/page_range.cc',
+    'printing/page_range.h',
+    'printing/page_setup.cc',
+    'printing/page_setup.h',
+    'printing/print_job.cc',
+    'printing/print_job.h',
+    'printing/print_job_manager.cc',
+    'printing/print_job_manager.h',
+    'printing/print_job_worker.cc',
+    'printing/print_job_worker.h',
+    'printing/print_job_worker_owner.h',
+    'printing/print_settings.cc',
+    'printing/print_settings.h',
+    'printing/print_view_manager.cc',
+    'printing/print_view_manager.h',
+    'printing/printed_document.cc',
+    'printing/printed_document.h',
+    'printing/printed_page.cc',
+    'printing/printed_page.h',
+    'printing/printed_pages_source.h',
+    'printing/printer_query.cc',
+    'printing/printer_query.h',
+    'printing/units.cc',
+    'printing/units.h',
+    'printing/win_printing_context.cc',
+    'printing/win_printing_context.h',
+  ]),
+  MSVSFilter('Sandbox', [
+    'sandbox_policy.cc',
+    'sandbox_policy.h',
+  ]),
+  MSVSFilter('Password Manager', [
+    'password_manager/encryptor.cc',
+    'password_manager/encryptor.h',
+    'password_manager/ie7_password.cc',
+    'password_manager/ie7_password.h',
+    'password_manager/password_form_manager.cc',
+    'password_manager/password_form_manager.h',
+    'password_manager/password_manager.cc',
+    'password_manager/password_manager.h',
+  ]),
+  MSVSFilter('External Tab', [
+    'external_tab_container.cc',
+    'external_tab_container.h',
+  ]),
+  MSVSFilter('DOM UI', [
+    'dom_ui/chrome_url_data_manager.cc',
+    'dom_ui/chrome_url_data_manager.h',
+    'dom_ui/dom_ui.cc',
+    'dom_ui/dom_ui.h',
+    'dom_ui/dom_ui_contents.cc',
+    'dom_ui/dom_ui_contents.h',
+    'dom_ui/dom_ui_host.cc',
+    'dom_ui/dom_ui_host.h',
+    'dom_ui/history_ui.cc',
+    'dom_ui/history_ui.h',
+    'dom_ui/html_dialog_contents.cc',
+    'dom_ui/html_dialog_contents.h',
+    'dom_ui/new_tab_ui.cc',
+    'dom_ui/new_tab_ui.h',
+  ]),
+  MSVSFilter('NativeUI', [
+    'history_tab_ui.cc',
+    'history_tab_ui.h',
+  ]),
+  MSVSFilter('Net', [
     'net/chrome_url_request_context.cc',
+    'net/chrome_url_request_context.h',
+    'net/dns_global.cc',
+    'net/dns_global.h',
     'net/dns_host_info.cc',
+    'net/dns_host_info.h',
+    'net/dns_master.cc',
+    'net/dns_master.h',
+    'net/dns_slave.cc',
+    'net/dns_slave.h',
     'net/referrer.cc',
+    'net/referrer.h',
     'net/sdch_dictionary_fetcher.cc',
+    'net/sdch_dictionary_fetcher.h',
     'net/url_fetcher.cc',
+    'net/url_fetcher.h',
     'net/url_fetcher_protect.cc',
-    'page_state.cc',
-    'printing/page_number.cc',
-    'printing/page_range.cc',
-    'printing/page_setup.cc',
-    'printing/units.cc',
-    'tab_contents/provisional_load_details.cc',
-    'renderer_host/async_resource_handler.cc',
-    'renderer_host/buffered_resource_handler.cc',
-    'renderer_host/download_resource_handler.cc',
-    'renderer_host/download_throttling_resource_handler.cc',
-    'renderer_host/safe_browsing_resource_handler.cc',
-    'renderer_host/save_file_resource_handler.cc',
-    'renderer_host/sync_resource_handler.cc',
-    'renderer_security_policy.cc',
+    'net/url_fetcher_protect.h',
+    'net/url_fixer_upper.cc',
+    'net/url_fixer_upper.h',
+  ]),
+  MSVSFilter('RLZ', [
+    'rlz/rlz.cc',
+    'rlz/rlz.h',
+  ]),
+  MSVSFilter('Safe Browsing', [
     'safe_browsing/bloom_filter.cc',
+    'safe_browsing/bloom_filter.h',
     'safe_browsing/chunk_range.cc',
+    'safe_browsing/chunk_range.h',
+    'safe_browsing/protocol_manager.cc',
+    'safe_browsing/protocol_manager.h',
     'safe_browsing/protocol_parser.cc',
+    'safe_browsing/protocol_parser.h',
+    'safe_browsing/safe_browsing_blocking_page.cc',
+    'safe_browsing/safe_browsing_blocking_page.h',
     'safe_browsing/safe_browsing_database.cc',
+    'safe_browsing/safe_browsing_database.h',
     'safe_browsing/safe_browsing_database_bloom.cc',
+    'safe_browsing/safe_browsing_database_bloom.h',
     'safe_browsing/safe_browsing_database_impl.cc',
+    'safe_browsing/safe_browsing_database_impl.h',
+    'safe_browsing/safe_browsing_service.cc',
+    'safe_browsing/safe_browsing_service.h',
     'safe_browsing/safe_browsing_util.cc',
+    'safe_browsing/safe_browsing_util.h',
+  ]),
+  MSVSFilter('Accessibility', [
+    'browser_accessibility.cc',
+    'browser_accessibility.h',
+    'browser_accessibility_manager.cc',
+    'browser_accessibility_manager.h',
+    'iaccessible_function_ids.h',
+  ]),
+  MSVSFilter('Download', [
+    'download/download_exe.cc',
+    'download/download_file.cc',
+    'download/download_file.h',
+    'download/download_item_model.cc',
+    'download/download_item_model.h',
+    'download/download_manager.cc',
+    'download/download_manager.h',
+    'download/download_request_manager.cc',
+    'download/download_request_manager.h',
+    'download/download_util.cc',
+    'download/download_util.h',
+  ]),
+  MSVSFilter('Save Page', [
+    'download/save_file.cc',
+    'download/save_file.h',
+    'download/save_file_manager.cc',
+    'download/save_file_manager.h',
+    'download/save_item.cc',
+    'download/save_item.h',
+    'download/save_package.cc',
+    'download/save_package.h',
+    'download/save_page_model.cc',
+    'download/save_page_model.h',
+    'download/save_types.h',
+  ]),
+  MSVSFilter('Autofill', [
+    'autofill_manager.cc',
+    'autofill_manager.h',
+  ]),
+  MSVSFilter('Extensions', [
+    'extensions/extension.cc',
+    'extensions/extension.h',
+    'extensions/extension_protocols.cc',
+    'extensions/extension_protocols.h',
+    'extensions/extensions_service.cc',
+    'extensions/extensions_service.h',
+    'extensions/user_script_master.cc',
+    'extensions/user_script_master.h',
+  ]),
+  MSVSFilter('Renderer Host', [
+    'renderer_host/async_resource_handler.cc',
+    'renderer_host/async_resource_handler.h',
+    'renderer_host/browser_render_process_host.cc',
+    'renderer_host/browser_render_process_host.h',
+    'renderer_host/buffered_resource_handler.cc',
+    'renderer_host/buffered_resource_handler.h',
+    'renderer_host/cross_site_resource_handler.cc',
+    'renderer_host/cross_site_resource_handler.h',
+    'renderer_host/download_resource_handler.cc',
+    'renderer_host/download_resource_handler.h',
+    'renderer_host/download_throttling_resource_handler.cc',
+    'renderer_host/download_throttling_resource_handler.h',
+    'renderer_host/render_process_host.cc',
+    'renderer_host/render_process_host.h',
+    'renderer_host/resource_dispatcher_host.cc',
+    'renderer_host/resource_dispatcher_host.h',
+    'renderer_host/resource_handler.h',
+    'renderer_host/safe_browsing_resource_handler.cc',
+    'renderer_host/safe_browsing_resource_handler.h',
+    'renderer_host/save_file_resource_handler.cc',
+    'renderer_host/save_file_resource_handler.h',
+    'renderer_host/sync_resource_handler.cc',
+    'renderer_host/sync_resource_handler.h',
+  ]),
+  MSVSFilter('Tab Contents', [
+    'tab_contents/about_internets_status_view.cc',
+    'tab_contents/about_internets_status_view.h',
+    'tab_contents/constrained_window.h',
+    'tab_contents/infobar_delegate.cc',
+    'tab_contents/infobar_delegate.h',
+    'tab_contents/interstitial_page.cc',
+    'tab_contents/interstitial_page.h',
+    'tab_contents/ipc_status_view.cc',
+    'tab_contents/ipc_status_view.h',
+    'tab_contents/native_ui_contents.cc',
+    'tab_contents/native_ui_contents.h',
+    'tab_contents/navigation_controller.cc',
+    'tab_contents/navigation_controller.h',
+    'tab_contents/navigation_entry.cc',
+    'tab_contents/navigation_entry.h',
+    'tab_contents/network_status_view.cc',
+    'tab_contents/network_status_view.h',
+    'tab_contents/page_navigator.h',
+    'tab_contents/provisional_load_details.cc',
+    'tab_contents/provisional_load_details.h',
+    'tab_contents/site_instance.cc',
+    'tab_contents/site_instance.h',
+    'tab_contents/status_view.cc',
+    'tab_contents/status_view.h',
+    'tab_contents/tab_contents.cc',
+    'tab_contents/tab_contents.h',
+    'tab_contents/tab_contents_delegate.h',
+    'tab_contents/tab_contents_factory.cc',
+    'tab_contents/tab_contents_factory.h',
+    'tab_contents/tab_contents_type.h',
+    'tab_contents/tab_util.cc',
+    'tab_contents/tab_util.h',
+    'tab_contents/view_source_contents.cc',
+    'tab_contents/view_source_contents.h',
+    'tab_contents/web_contents.cc',
+    'tab_contents/web_contents.h',
+    'tab_contents/web_contents_view.cc',
+    'tab_contents/web_contents_view.h',
+    'tab_contents/web_contents_view_win.cc',
+    'tab_contents/web_contents_view_win.h',
+    'tab_contents/web_drag_source.cc',
+    'tab_contents/web_drag_source.h',
+    'tab_contents/web_drop_target.cc',
+    'tab_contents/web_drop_target.h',
+  ]),
+  MSVSFilter('Search Engines', [
     'search_engines/template_url.cc',
+    'search_engines/template_url.h',
+    'search_engines/template_url_fetcher.cc',
+    'search_engines/template_url_fetcher.h',
     'search_engines/template_url_model.cc',
+    'search_engines/template_url_model.h',
     'search_engines/template_url_parser.cc',
-    'session_startup_pref.cc',
-    'sessions/session_command.cc',
-    'sessions/session_id.cc',
-    'spellcheck_worditerator.cc',
+    'search_engines/template_url_parser.h',
+    'search_engines/template_url_prepopulate_data.cc',
+    'search_engines/template_url_prepopulate_data.h',
+  ]),
+  MSVSFilter('Metrics', [
+    'metrics/metrics_log.cc',
+    'metrics/metrics_log.h',
+    'metrics/metrics_response.cc',
+    'metrics/metrics_response.h',
+    'metrics/metrics_service.cc',
+    'metrics/metrics_service.h',
+    'metrics/user_metrics.cc',
+    'metrics/user_metrics.h',
+  ]),
+  MSVSFilter('SSL', [
+    'ssl/ssl_blocking_page.cc',
+    'ssl/ssl_blocking_page.h',
     'ssl/ssl_error_info.cc',
-    'webdata/web_database.cc',
-
+    'ssl/ssl_error_info.h',
+    'ssl/ssl_manager.cc',
+    'ssl/ssl_manager.h',
+    'ssl/ssl_policy.cc',
+    'ssl/ssl_policy.h',
+  ]),
+    'browser_trial.cc',
+    'browser_trial.h',
+    'cert_store.cc',
+    'cert_store.h',
+    'chrome_plugin_browsing_context.cc',
+    'chrome_plugin_browsing_context.h',
+    'chrome_plugin_host.cc',
+    'encoding_menu_controller_delegate.cc',
+    'encoding_menu_controller_delegate.h',
+    'external_protocol_handler.cc',
+    'external_protocol_handler.h',
+    'gears_integration.cc',
+    'gears_integration.h',
+    'google_update.cc',
+    'google_update.h',
+    'modal_html_dialog_delegate.cc',
+    'modal_html_dialog_delegate.h',
+    'page_state.cc',
+    'page_state.h',
+    'plugin_installer.cc',
+    'plugin_installer.h',
+    'toolbar_model.cc',
+    'toolbar_model.h',
 ])
 
-if not env.Bit('mac'):
-  input_files.extend([
+if env.Bit('mac'):
+  input_files.Remove(
       'spellchecker.cc',
-  ])
+  )
 
-if env.Bit('windows'):
+if not env.Bit('windows'):
   # TODO: Port these.
-  input_files.extend([
+  input_files.Remove(
       'autofill_manager.cc',
       'alternate_nav_url_fetcher.cc',
       'app_modal_dialog_queue.cc',
@@ -300,38 +835,133 @@ if env.Bit('windows'):
       'task_manager_resource_providers.cc',
       'toolbar_model.cc',
       'user_data_manager.cc',
+      'views/download_tab_view.cc',
       'visitedlink_master.cc',
       'web_app.cc',
       'web_app_icon_manager.cc',
       'web_app_launcher.cc',
       'webdata/web_data_service.cc',
       'window_sizer.cc',
-  ])
-
-  env.TypeLibrary('history/history_indexer.idl')
+  )
 
-  input_files.extend([
+  input_files.Remove(
       'browser_main_win.cc',
       'importer/firefox_profile_lock_win.cc',
       'render_widget_host_view_win.cc',
       'tab_contents/web_contents_view_win.cc',
       'webdata/web_database_win.cc',
-  ])
+      '../tools/build/win/precompiled_wtl.cc',
+      '../tools/build/win/precompiled_wtl.h',
+  )
 
-if env.Bit('posix'):
-  input_files.extend([
+if env.Bit('windows'):
+  env.TypeLibrary('history/history_indexer.idl')
+
+if not env.Bit('posix'):
+  input_files.Remove(
       'importer/firefox_profile_lock_posix.cc',
-  ])
+  )
 
 if not env.Bit('mac'):
   # TODO: This should work for all platforms.
   env.ChromeLibrary('browser', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/browser/browser.vcproj',
-                dependencies = [
-                    '$LIBXML_DIR/build/libxml_config.vcproj',
-                    '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj',
-                    '$NET_DIR/build/net_resources.vcproj',
-                    '$CHROME_DIR/app/generated_resources.vcproj',
-                ],
-                guid='{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}')
+p = env.ChromeMSVSProject('browser.vcproj',
+                          dest='$CHROME_SRC_DIR/chrome/browser/browser.vcproj',
+                          guid='{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}',
+                          keyword='Win32Proj',
+                          root_namespace='Browser',
+                          dependencies = [
+                              '$LIBXML_DIR/build/libxml_config.vcproj',
+                              '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj',
+                              '$NET_DIR/build/net_resources.vcproj',
+                              '$CHROME_DIR/app/generated_resources.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'Resource text file copy',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+p.AddToolFile('../tools/build/win/resource_text_file_copy.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './browser.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../tools/build/win/precompiled_wtl.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './browser.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)/tools/build/win/js_engine.vsprops',
+            ])
+
+p.AddFileConfig('../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])
+
+p.AddFileConfig('../tools/build/win/precompiled_wtl.cc',
+                'Release|Win32',
+                ExcludedFromBuild='true',
+                tools=[
+                    'VCCLCompilerTool',
+                ])
+
+xmldoc_files = [
+    'net/url_fetcher.cc',
+    'net/url_fetcher_protect.cc',
+    'net/url_fixer_upper.cc',
+    'password_manager/encryptor.cc',
+    'search_engines/template_url.cc',
+    'search_engines/template_url_fetcher.cc',
+    'search_engines/template_url_model.cc',
+    'search_engines/template_url_parser.cc',
+    'search_engines/template_url_prepopulate_data.cc',
+    'ssl/ssl_blocking_page.cc',
+    'ssl/ssl_error_info.cc',
+    'ssl/ssl_manager.cc',
+    'ssl/ssl_policy.cc',
+    'tab_contents/interstitial_page.cc',
+    'tab_contents/native_ui_contents.cc',
+    'tab_contents/navigation_controller.cc',
+    'tab_contents/navigation_entry.cc',
+    'tab_contents/provisional_load_details.cc',
+    'tab_contents/site_instance.cc',
+    'tab_contents/web_drag_source.cc',
+    'tab_contents/web_drop_target.cc',
+]
+
+xmldoc_tool_list = [
+    MSVSTool('VCCLCompilerTool',
+             XMLDocumentationFileName=('$(IntDir)/$(InputName)1.xdc'),
+             ObjectFile='$(IntDir)/$(InputName)1.obj'),
+]
+
+for filename in xmldoc_files:
+  p.AddFileConfig(filename, 'Debug|Win32', xmldoc_tool_list)
+  p.AddFileConfig(filename, 'Release|Win32', xmldoc_tool_list)
diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons
index 22c62d8..df3fb80 100644
--- a/chrome/browser/debugger/debugger.scons
+++ b/chrome/browser/debugger/debugger.scons
@@ -25,49 +25,158 @@ env.Prepend(
     ],
 )
 
-input_files = [
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('resources', [
+    'resources/debugger.css',
+    'resources/debugger.html',
+    'resources/debugger.js',
+    'resources/debugger_shell.js',
+  ]),
     'debugger_contents.cc',
+    'debugger_contents.h',
+    'debugger_host.h',
     'debugger_host_impl.cpp',
+    'debugger_host_impl.h',
+    'debugger_io.h',
     'debugger_io_socket.cc',
+    'debugger_io_socket.h',
     'debugger_node.cc',
+    'debugger_node.h',
     'debugger_shell.cc',
+    'debugger_shell.h',
+    'resources/debugger_resources.h',
     'debugger_view.cc',
+    'debugger_view.h',
     'debugger_window.cc',
+    'debugger_window.h',
     'debugger_wrapper.cc',
-]
+    'debugger_wrapper.h',
+])
 
 if env.Bit('linux'):
   # TODO(port): Port these.
-  remove_list = [
+  input_files.Remove(
       'debugger_contents.cc',
       'debugger_host_impl.cpp',
       'debugger_node.cc',
       'debugger_shell.cc',
       'debugger_view.cc',
       'debugger_window.cc',
-  ]
-  for file in remove_list:
-    input_files.remove(file)
+  )
 
 if env.Bit('mac'):
   # TODO(port): Port these.
-  remove_list = [
+  input_files.Remove(
       'debugger_contents.cc',
       'debugger_host_impl.cpp',
       'debugger_node.cc',
       'debugger_shell.cc',
       'debugger_view.cc',
       'debugger_window.cc',
-  ]
-  for file in remove_list:
-    input_files.remove(file)
+  )
 
 if not env.Bit('mac'):
   # TODO(port): Enable for Mac.
   env.ChromeLibrary('debugger', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/browser/debugger/debugger.vcproj',
-                dependencies = [
-                    '$CHROME_DIR/app/generated_resources.vcproj',
-                ],
-                guid='{57823D8C-A317-4713-9125-2C91FDFD12D6}')
+
+p = env.ChromeMSVSProject('debugger.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'browser/debugger/debugger.vcproj'),
+                          guid='{57823D8C-A317-4713-9125-2C91FDFD12D6}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$CHROME_DIR/app/generated_resources.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './debugger.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './debugger.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])
+
+##############################################################################
+# TODO(sgk):  move to a separate debugger_disabled.scons file? ###############
+
+input_files = ChromeFileList([
+  'debugger_contents.cc',
+  'debugger_contents.h',
+  'debugger_shell.h',
+  'debugger_window.cc',
+  'debugger_window.h',
+  'debugger_wrapper.cc',
+  'debugger_wrapper.h',
+])
+
+p = env.ChromeMSVSProject('debugger_disabled.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'browser/debugger/debugger_disabled.vcproj'),
+                          guid='{369B9881-3F2C-464D-A96C-E281405DF8F6}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+                './debugger_disabled.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+                './debugger_disabled.vsprops',
+            ])
diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript
index ccbfd3f..34fb138 100644
--- a/chrome/browser/views/SConscript
+++ b/chrome/browser/views/SConscript
@@ -50,99 +50,250 @@ env.Append(
     ],
 )
 
-input_files = [
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Frame', [
+    'frame/aero_glass_frame.cc',
+    'frame/aero_glass_frame.h',
+    'frame/aero_glass_non_client_view.cc',
+    'frame/aero_glass_non_client_view.h',
+    'frame/browser_frame.h',
+    'frame/browser_view.cc',
+    'frame/browser_view.h',
+    'frame/browser_window_factory.cc',
+    'frame/opaque_frame.cc',
+    'frame/opaque_frame.h',
+    'frame/opaque_non_client_view.cc',
+    'frame/opaque_non_client_view.h',
+  ]),
+  MSVSFilter('Info Bars', [
+    'infobars/infobar_container.cc',
+    'infobars/infobar_container.h',
+    'infobars/infobars.cc',
+    'infobars/infobars.h',
+  ]),
+  MSVSFilter('Options', [
+    'options/advanced_contents_view.cc',
+    'options/advanced_contents_view.h',
+    'options/advanced_page_view.cc',
+    'options/advanced_page_view.h',
+    'options/content_page_view.cc',
+    'options/content_page_view.h',
+    'options/cookies_view.cc',
+    'options/cookies_view.h',
+    'options/fonts_languages_window_view.cc',
+    'options/fonts_languages_window_view.h',
+    'options/fonts_page_view.cc',
+    'options/fonts_page_view.h',
+    'options/general_page_view.cc',
+    'options/general_page_view.h',
+    'options/language_combobox_model.cc',
+    'options/language_combobox_model.h',
+    'options/languages_page_view.cc',
+    'options/languages_page_view.h',
+    'options/options_group_view.cc',
+    'options/options_group_view.h',
+    'options/options_page_view.cc',
+    'options/options_page_view.h',
+    'options/options_window_view.cc',
+  ]),
+  MSVSFilter('Tabs', [
+    'tabs/dragged_tab_controller.cc',
+    'tabs/dragged_tab_controller.h',
+    'tabs/dragged_tab_view.cc',
+    'tabs/dragged_tab_view.h',
+    'tabs/hwnd_photobooth.cc',
+    'tabs/hwnd_photobooth.h',
+    'tabs/tab.cc',
+    'tabs/tab.h',
+    'tabs/tab_renderer.cc',
+    'tabs/tab_renderer.h',
+    'tabs/tab_strip.cc',
+    'tabs/tab_strip.h',
+  ]),
+  MSVSFilter('Find Bar', [
+    'find_bar_view.cc',
+    'find_bar_view.h',
+    'find_bar_win.cc',
+    'find_bar_win.h',
+  ]),
     'about_chrome_view.cc',
+    'about_chrome_view.h',
     'blocked_popup_container.cc',
+    'blocked_popup_container.h',
     'bookmark_bar_view.cc',
+    'bookmark_bar_view.h',
     'bookmark_bubble_view.cc',
+    'bookmark_bubble_view.h',
     'bookmark_editor_view.cc',
+    'bookmark_editor_view.h',
     'bookmark_folder_tree_view.cc',
+    'bookmark_folder_tree_view.h',
     'bookmark_manager_view.cc',
+    'bookmark_manager_view.h',
     'bookmark_table_view.cc',
+    'bookmark_table_view.h',
     'bug_report_view.cc',
+    'bug_report_view.h',
     'clear_browsing_data.cc',
+    'clear_browsing_data.h',
     'constrained_window_impl.cc',
+    'constrained_window_impl.h',
     'delay_view.cc',
+    'delay_view.h',
     'dom_view.cc',
+    'dom_view.h',
     'download_item_view.cc',
+    'download_item_view.h',
     'download_shelf_view.cc',
+    'download_shelf_view.h',
     'download_started_animation.cc',
-    'download_tab_view.cc',
+    'download_started_animation.h',
     'edit_keyword_controller.cc',
+    'edit_keyword_controller.h',
     'event_utils.cc',
+    'event_utils.h',
     'external_protocol_dialog.cc',
-    'find_bar_view.cc',
+    'external_protocol_dialog.h',
     'first_run_bubble.cc',
+    'first_run_bubble.h',
     'first_run_customize_view.cc',
+    'first_run_customize_view.h',
     'first_run_view.cc',
+    'first_run_view.h',
     'first_run_view_base.cc',
-    'frame/aero_glass_frame.cc',
-    'frame/aero_glass_non_client_view.cc',
-    'frame/browser_view.cc',
-    'frame/browser_window_factory.cc',
-    'frame/opaque_frame.cc',
-    'frame/opaque_non_client_view.cc',
+    'first_run_view_base.h',
     'go_button.cc',
+    'go_button.h',
     'html_dialog_view.cc',
+    'html_dialog_view.h',
     'hung_renderer_view.cc',
+    'hung_renderer_view.h',
     'hwnd_html_view.cc',
+    'hwnd_html_view.h',
     'importer_lock_view.cc',
+    'importer_lock_view.h',
     'importer_view.cc',
+    'importer_view.h',
     'importing_progress_view.cc',
+    'importing_progress_view.h',
     'info_bubble.cc',
-    'infobars/infobar_container.cc',
-    'infobars/infobars.cc',
+    'info_bubble.h',
     'input_window.cc',
+    'input_window.h',
     'keyword_editor_view.cc',
+    'keyword_editor_view.h',
     'location_bar_view.cc',
+    'location_bar_view.h',
     'login_view.cc',
+    'login_view.h',
     'new_profile_dialog.cc',
-    'options/advanced_contents_view.cc',
-    'options/advanced_page_view.cc',
-    'options/content_page_view.cc',
-    'options/cookies_view.cc',
-    'options/fonts_languages_window_view.cc',
-    'options/fonts_page_view.cc',
-    'options/general_page_view.cc',
-    'options/language_combobox_model.cc',
-    'options/languages_page_view.cc',
-    'options/options_group_view.cc',
-    'options/options_page_view.cc',
-    'options/options_window_view.cc',
+    'new_profile_dialog.h',
     'page_info_window.cc',
+    'page_info_window.h',
     'password_manager_view.cc',
+    'password_manager_view.h',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
     'restart_message_box.cc',
+    'restart_message_box.h',
     'sad_tab_view.cc',
+    'sad_tab_view.h',
     'select_profile_dialog.cc',
+    'select_profile_dialog.h',
     'shelf_item_dialog.cc',
+    'shelf_item_dialog.h',
     'shell_dialogs.cc',
+    'standard_layout.h',
     'star_toggle.cc',
+    'star_toggle.h',
     'status_bubble.cc',
-    'tabs/dragged_tab_controller.cc',
-    'tabs/dragged_tab_view.cc',
-    'tabs/hwnd_photobooth.cc',
-    'tabs/tab.cc',
-    'tabs/tab_renderer.cc',
-    'tabs/tab_strip.cc',
-    'tab_icon_view.cc',
+    'status_bubble.h',
     'tab_contents_container_view.cc',
+    'tab_contents_container_view.h',
+    'tab_icon_view.cc',
+    'tab_icon_view.h',
     'theme_helpers.cc',
+    'theme_helpers.h',
     'toolbar_star_toggle.cc',
+    'toolbar_star_toggle.h',
     'toolbar_view.cc',
+    'toolbar_view.h',
     'user_data_dir_dialog.cc',
-]
+    'user_data_dir_dialog.h',
+])
 
-if env.Bit('windows'):
-  input_files.extend([
+if not env.Bit('windows'):
+  input_files.Remove(
       'find_bar_win.cc',
-  ])
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 env.ChromeLibrary('browser_views', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/browser/views/browser_views.vcproj',
-                dependencies = [
-                    '$LIBXML_DIR/build/libxml_config.vcproj',
-                    '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj',
-                    '$CHROME_DIR/app/generated_resources.vcproj',
-                ],
-                guid='{FA537565-7B03-4FFC-AF15-F7A979B72E22}')
+p = env.ChromeMSVSProject('browser_views.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'browser/views/browser_views.vcproj'),
+                          root_namespace='Browser_views',
+                          guid='{FA537565-7B03-4FFC-AF15-F7A979B72E22}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$LIBXML_DIR/build/libxml_config.vcproj',
+                              '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj',
+                              '$CHROME_DIR/app/generated_resources.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '../browser.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '../browser.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)/tools/build/win/js_engine.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Release|Win32',
+                ExcludedFromBuild='true',
+                tools=[
+                    'VCCLCompilerTool',
+                ])