Fix the current remaining Views-GTK compile and linker errors.

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index a15301754362dc7771698a763a8a5c8fc4acd4f1..0ad4cd8b278b1d326d2bd77970f1c5ca55eb7d1c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1947,6 +1947,12 @@
                 ['include', '^browser/views/dragged_tab_controller.h'],
                 ['include', '^browser/views/event_utils.cc'],
                 ['include', '^browser/views/event_utils.h'],
+                ['include', '^browser/views/extensions/extension_shelf.cc'],
+                ['include', '^browser/views/extensions/extension_shelf.h'],
+                ['include', '^browser/views/extensions/extension_view.cc'],
+                ['include', '^browser/views/extensions/extension_view.h'],
+                ['include', '^browser/views/extension_view.cc'],
+                ['include', '^browser/views/extension_view.h'],
                 ['include', '^browser/views/find_bar_view.cc'],
                 ['include', '^browser/views/find_bar_view.h'],
                 ['include', '^browser/views/find_bar_win.cc'],
@@ -2002,23 +2008,38 @@
                 ['exclude', '^browser/gtk'],
                 ['include', '^browser/gtk/autocomplete_edit_gtk.cc'],
                 ['include', '^browser/gtk/autocomplete_edit_gtk.h'],
+                ['include', '^browser/gtk/clear_browsing_data_dialog_gtk.cc'],
+                ['include', '^browser/gtk/clear_browsing_data_dialog_gtk.h'],
                 ['include', '^browser/gtk/dialogs_gtk.cc'],
                 ['include', '^browser/gtk/dialogs_gtk.h'],
                 ['include', '^browser/gtk/download_started_animation_gtk.cc'],
                 ['include', '^browser/gtk/download_started_animation_gtk.h'],
+                ['include', '^browser/gtk/edit_search_engine_dialog.cc'],
+                ['include', '^browser/gtk/edit_search_engine_dialog.h'],
                 ['include', '^browser/gtk/focus_store_gtk.cc'],
                 ['include', '^browser/gtk/focus_store_gtk.h'],
+                ['include', '^browser/gtk/gtk_dnd_util.cc'],
+                ['include', '^browser/gtk/gtk_dnd_util.h'],
                 ['include', '^browser/gtk/hung_renderer_dialog_gtk.cc'],
                 ['include', '^browser/gtk/hung_renderer_dialog_gtk.h'],
+                ['include', '^browser/gtk/import_dialog_gtk.cc'],
+                ['include', '^browser/gtk/import_dialog_gtk.h'],
+                ['include', '^browser/gtk/import_progress_dialog_gtk.cc'],
+                ['include', '^browser/gtk/import_progress_dialog_gtk.h'],
+                ['include', '^browser/gtk/import_lock_dialog_gtk.cc'],
+                ['include', '^browser/gtk/import_lock_dialog_gtk.h'],
+                ['include', '^browser/gtk/keyword_editor_view.cc'],
+                ['include', '^browser/gtk/keyword_editor_view.h'],
+                ['include', '^browser/gtk/list_store_favicon_loader.cc'],
+                ['include', '^browser/gtk/list_store_favicon_loader.h'],
                 ['include', '^browser/gtk/options'],
+                ['include', '^browser/gtk/options/general_page_gtk.cc'],
+                ['include', '^browser/gtk/options/general_page_gtk.h'],
                 ['include', '^browser/gtk/menu_gtk.cc'],
                 ['include', '^browser/gtk/menu_gtk.h'],
                 ['include', '^browser/gtk/sad_tab_gtk.cc'],
                 ['include', '^browser/gtk/sad_tab_gtk.h'],
 
-                # More GTK stuff to exclude outside of the browser/gtk directory
-                ['exclude', '^browser/bookmarks/bookmark_context_menu_gtk.cc'],
-
                 # Other excluded stuff.
                 ['exclude', '^browser/browser_theme_provider_gtk.cc'],
                 ['exclude', '^browser/extensions/external_registry_extension_provider_win.cc'],