Catch up chrome.gyp with recent additions:

* browser/bookmarks/bookmark_menu_controller.{cc,h}
  (Windows only)
* browser/browser_unittest.cc
* browser/views/autocomplate/autocomplete_popup_contents_view.{cc,h}
* browser/views/autocomplate/autocomplete_popup_win.{cc,h}
* browser/views/bookmark_menu_button.{cc,h}
* browser/views/frame/browser_root_view.{cc,h}
* browser/views/uninstall_dialog.{cc,h}
* test/automation/autocomplete_edit_proxy.{cc,h}
  (Windows only)
* test/automation/constrained_window_proxy.{cc,h}
* test/ui_test_utils.{cc,h}

Add apparently overlooked .h file:
* test/automation/automation_constants.h.

Add tools/build/win/precompiled_wtl.{cc,h} to 'browser', with the
right 'msvs_precompiled_{header,source}' settings to work that magic.

Add 'views' to the 'app' dependency list.

Add a '-lOleAcc.lib' link setting (Windows only) to 'ui_tests'.

Add test/perf/mem_usage.cc to 'page_cycler_tests' (Windows only).

Have 'renderer' export its dependency on 'plugin'
(for calls to IsPluginProcess())

Remove spurious browser/views/fill_layout.{cc,h}
(the real files are just views/fill_layout.{cc,h}).
Review URL: http://codereview.chromium.org/92052

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

1 files changed, 58 insertions, 8 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c88046e..6c7aeaf 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -458,6 +458,8 @@
         'browser/bookmarks/bookmark_folder_tree_model.h',
         'browser/bookmarks/bookmark_html_writer.cc',
         'browser/bookmarks/bookmark_html_writer.h',
+        'browser/bookmarks/bookmark_menu_controller.cc',
+        'browser/bookmarks/bookmark_menu_controller.h',
         'browser/bookmarks/bookmark_model.cc',
         'browser/bookmarks/bookmark_model.h',
         'browser/bookmarks/bookmark_service.h',
@@ -1137,6 +1139,10 @@
         'browser/views/about_ipc_dialog.h',
         'browser/views/about_network_dialog.cc',
         'browser/views/about_network_dialog.h',
+        'browser/views/autocomplete/autocomplete_popup_contents_view.cc',
+        'browser/views/autocomplete/autocomplete_popup_contents_view.h',
+        'browser/views/autocomplete/autocomplete_popup_win.cc',
+        'browser/views/autocomplete/autocomplete_popup_win.h',
         'browser/views/blocked_popup_container.cc',
         'browser/views/blocked_popup_container.h',
         'browser/views/bookmark_bar_view.cc',
@@ -1149,6 +1155,8 @@
         'browser/views/bookmark_folder_tree_view.h',
         'browser/views/bookmark_manager_view.cc',
         'browser/views/bookmark_manager_view.h',
+        'browser/views/bookmark_menu_button.cc',
+        'browser/views/bookmark_menu_button.h',
         'browser/views/bookmark_table_view.cc',
         'browser/views/bookmark_table_view.h',
         'browser/views/bug_report_view.cc',
@@ -1171,8 +1179,6 @@
         'browser/views/event_utils.h',
         'browser/views/external_protocol_dialog.cc',
         'browser/views/external_protocol_dialog.h',
-        'browser/views/fill_layout.cc',
-        'browser/views/fill_layout.h',
         'browser/views/find_bar_view.cc',
         'browser/views/find_bar_view.h',
         'browser/views/find_bar_win.cc',
@@ -1187,6 +1193,8 @@
         'browser/views/first_run_view_base.h',
         'browser/views/frame/browser_frame.cc',
         'browser/views/frame/browser_frame.h',
+        'browser/views/frame/browser_root_view.cc',
+        'browser/views/frame/browser_root_view.h',
         'browser/views/frame/browser_view.cc',
         'browser/views/frame/browser_view.h',
         'browser/views/frame/glass_browser_frame_view.cc',
@@ -1294,6 +1302,8 @@
         'browser/views/toolbar_star_toggle.h',
         'browser/views/toolbar_view.cc',
         'browser/views/toolbar_view.h',
+        'browser/views/uninstall_dialog.cc',
+        'browser/views/uninstall_dialog.h',
         'browser/views/user_data_dir_dialog.cc',
         'browser/views/user_data_dir_dialog.h',
         'browser/visitedlink_master.cc',
@@ -1310,6 +1320,8 @@
         'browser/worker_host/worker_process_host.h',
         'browser/worker_host/worker_service.cc',
         'browser/worker_host/worker_service.h',
+        'tools/build/win/precompiled_wtl.h',
+        'tools/build/win/precompiled_wtl.cc',
 
         # This file is generated by GRIT.
         '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/theme_resources_map.cc',
@@ -1379,6 +1391,12 @@
             'browser/debugger/debugger_shell_stubs.cc',
             'browser/history/history_publisher_none.cc',
           ],
+          'configurations': {
+            'Debug': {
+              'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+              'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
+            },
+          },
         }, {  # 'OS!="win"
           'sources/': [
             # Exclude all of hang_monitor.
@@ -1400,6 +1418,8 @@
           'sources!': [
             'browser/autocomplete/autocomplete_accessibility.cc',
             'browser/automation/ui_controls.cc',
+            'browser/bookmarks/bookmark_menu_controller.cc',
+            'browser/bookmarks/bookmark_menu_controller.h',
             'browser/browser_accessibility.cc',
             'browser/browser_accessibility_manager.cc',
             'browser/debugger/debugger_view.cc',
@@ -1548,6 +1568,9 @@
           'dependencies': [
             'plugin',
           ],
+          'export_dependent_settings': [
+            'plugin',
+          ],
         }],
         # Linux-specific rules.
         ['OS=="linux"', {
@@ -1706,11 +1729,6 @@
             }],
           ],
         }],
-        ['OS=="linux"', {
-          'dependencies': [
-            'views',
-          ]
-        }],
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',
@@ -1857,12 +1875,17 @@
         'renderer/mock_render_process.h',
         'renderer/mock_render_thread.cc',
         'renderer/mock_render_thread.h',
+        'test/automation/autocomplete_edit_proxy.cc',
+        'test/automation/autocomplete_edit_proxy.h',
+        'test/automation/automation_constants.h',
         'test/automation/automation_handle_tracker.cc',
         'test/automation/automation_handle_tracker.h',
         'test/automation/automation_proxy.cc',
         'test/automation/automation_proxy.h',
         'test/automation/browser_proxy.cc',
         'test/automation/browser_proxy.h',
+        'test/automation/constrained_window_proxy.cc',
+        'test/automation/constrained_window_proxy.h',
         'test/automation/tab_proxy.cc',
         'test/automation/tab_proxy.h',
         'test/automation/window_proxy.cc',
@@ -1885,6 +1908,11 @@
           'include_dirs': [
             'third_party/wtl/include',
           ],
+        }, { # OS != "win"
+          'sources!': [
+            'test/automation/autocomplete_edit_proxy.cc',
+            'test/automation/autocomplete_edit_proxy.h',
+          ],
         }],
       ],
     },
@@ -2094,6 +2122,11 @@
             '../google_update/google_update.gyp:google_update',
             'views',
           ],
+          'link_settings': {
+            'libraries': [
+              '-lOleAcc.lib',
+            ],
+          },
         }, { # else: OS != "win"
           'sources!': [
             # TODO(port)?  (Most of these include windows.h or similar.)
@@ -2153,6 +2186,7 @@
         'browser/bookmarks/bookmark_table_model_unittest.cc',
         'browser/bookmarks/bookmark_utils_unittest.cc',
         'browser/browser_commands_unittest.cc',
+        'browser/browser_unittest.cc',
         'browser/debugger/devtools_remote_message_unittest.cc',
         'browser/debugger/devtools_remote_listen_socket_unittest.cc',
         'browser/debugger/devtools_remote_listen_socket_unittest.h',
@@ -2311,6 +2345,8 @@
         'test/render_view_test.h',
         'test/test_notification_tracker.cc',
         'test/test_notification_tracker.h',
+        'test/ui_test_utils.cc',
+        'test/ui_test_utils.h',
         'test/v8_unit_test.cc',
         'test/v8_unit_test.h',
         'views/controls/label_unittest.cc',
@@ -2386,6 +2422,7 @@
             'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
             'browser/bookmarks/bookmark_table_model_unittest.cc',
             'browser/browser_commands_unittest.cc',
+            'browser/browser_unittest.cc',
             'browser/extensions/test_extension_loader.cc',
             'browser/importer/firefox_importer_unittest.cc',
             'browser/importer/importer_unittest.cc',
@@ -2468,6 +2505,8 @@
       ],
       'sources': [
         'test/page_cycler/page_cycler_test.cc',
+        'test/perf/mem_usage.cc',
+        'test/perf/mem_usage.h',
         'tools/build/win/precompiled.cc',
         'tools/build/win/precompiled.h',
       ],
@@ -2482,6 +2521,11 @@
             'views',
           ],
         }],
+        ['OS!="win"', {
+          'sources!': [
+            'test/perf/mem_usage.cc',
+          ],
+        }],
       ],
     },
   ],
@@ -2550,7 +2594,6 @@
             'common',
             'renderer',
             'resources',
-            'views',
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
@@ -2572,6 +2615,11 @@
                 'browser/visitedlink_perftest.cc',
               ],
             }],
+            ['OS!="mac"', {
+              'dependencies': [
+                'views',
+              ],
+            }],
           ],
         },
       ],
@@ -2685,6 +2733,8 @@
             'views/focus/external_focus_tracker.h',
             'views/focus/focus_manager.cc',
             'views/focus/focus_manager.h',
+            'views/focus/focus_util_win.cc',
+            'views/focus/focus_util_win.h',
             'views/focus/view_storage.cc',
             'views/focus/view_storage.h',
             'views/grid_layout.cc',