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

Chrome still doesn't run.

Review URL: http://codereview.chromium.org/155026

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

9 files changed, 80 insertions, 9 deletions

diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 6d5c1f1..84753d9 100755
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -26,9 +26,12 @@
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 
-#if defined(OS_WIN)  // TODO(port): whittle this down as we port
+#if defined(TOOLKIT_VIEWS)  // TODO(port): whittle this down as we port
 #include "chrome/browser/task_manager.h"
 #include "chrome/browser/views/frame/browser_view.h"
+#endif
+
+#if defined(OS_WIN)
 #include "chrome/browser/views/keyword_editor_view.h"
 #endif
 
@@ -47,7 +50,7 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
   chrome_browser_net::RegisterPrefs(local_state);
   bookmark_utils::RegisterPrefs(local_state);
   PageInfoWindow::RegisterPrefs(local_state);
-#if defined(OS_WIN)  // TODO(port): whittle this down as we port
+#if defined(TOOLKIT_VIEWS)  // TODO(port): whittle this down as we port
   BrowserView::RegisterBrowserViewPrefs(local_state);
   TaskManager::RegisterPrefs(local_state);
 #endif
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index 104007f..78cad0d 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -776,8 +776,8 @@ void BrowserThemeProvider::ClearCaches() {
   image_cache_.clear();
 }
 
-#if defined(OS_WIN)
+#if defined(TOOLKIT_VIEWS)
 void BrowserThemeProvider::FreePlatformCaches() {
-  // Windows has no platform image cache to clear.
+  // Views (Skia) has no platform image cache to clear.
 }
 #endif
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc
index 18778d7..534766a 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.cc
+++ b/chrome/browser/gtk/bookmark_manager_gtk.cc
@@ -548,7 +548,12 @@ void BookmarkManagerGtk::ResetOrganizeMenu(bool left) {
 
   organize_menu_.reset(new BookmarkContextMenu(window_, profile_, NULL, NULL,
       parent, nodes, BookmarkContextMenu::BOOKMARK_MANAGER_ORGANIZE_MENU));
+#if defined(TOOLKIT_GTK)
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(organize_), organize_menu_->menu());
+#else
+  // GTK+Views should implement this somehow.
+  NOTIMPLEMENTED();
+#endif
 }
 
 void BookmarkManagerGtk::BuildLeftStore() {
@@ -1142,8 +1147,13 @@ gboolean BookmarkManagerGtk::OnRightTreeViewMotion(GtkWidget* tree_view,
 // static
 gboolean BookmarkManagerGtk::OnTreeViewButtonRelease(GtkWidget* tree_view,
     GdkEventButton* button, BookmarkManagerGtk* bm) {
+#if defined(TOOLKIT_GTK)
   if (button->button == 3)
     bm->organize_menu_->PopupAsContext(button->time);
+#else
+  // Implement on GTK+views.
+  NOTIMPLEMENTED();
+#endif
 
   if (bm->delaying_mousedown_ && (tree_view == bm->right_tree_view_)) {
     gtk_propagate_event(tree_view,
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 2e37219..6e0a5a4 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -912,7 +912,7 @@ bool ProfileImpl::HasCreatedDownloadManager() const {
 
 void ProfileImpl::InitThemes() {
   if (!created_theme_provider_) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
     scoped_refptr<BrowserThemeProvider> themes(new GtkThemeProvider);
 #else
     scoped_refptr<BrowserThemeProvider> themes(new BrowserThemeProvider);
diff --git a/chrome/browser/views/dialog_stubs_gtk.cc b/chrome/browser/views/dialog_stubs_gtk.cc
index 0616c6e..9296e4d 100644
--- a/chrome/browser/views/dialog_stubs_gtk.cc
+++ b/chrome/browser/views/dialog_stubs_gtk.cc
@@ -79,4 +79,15 @@ void ShowNewProfileDialog() {
   NOTIMPLEMENTED();
 }
 
+void ShowTaskManager() {
+  NOTIMPLEMENTED();
+}
+
+void EditSearchEngine(gfx::NativeWindow parent,
+                      const TemplateURL* template_url,
+                      EditSearchEngineControllerDelegate* delegate,
+                      Profile* profile) {
+  NOTIMPLEMENTED();
+}
+
 }  // namespace browser
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index e70c1bb..d60b966 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1969,6 +1969,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'],
@@ -2024,23 +2030,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'],
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 58a7bdc..39371e4 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -28,7 +28,11 @@
 #endif
 
 #if defined(TOOLKIT_VIEWS)
+#include "chrome/browser/bookmarks/bookmark_editor.h"
+#include "chrome/browser/bookmarks/bookmark_manager.h"
+#include "chrome/browser/tab_contents/constrained_window.h"
 #include "views/controls/menu/chrome_menu.h"
+#include "views/controls/single_split_view.h"
 #endif
 
 class InfoBar;
@@ -412,4 +416,25 @@ wchar_t MenuItemView::GetMnemonic() {
 
 }  // namespace views
 
+ConstrainedWindow* ConstrainedWindow::CreateConstrainedDialog(
+    TabContents* owner,
+    ConstrainedWindowDelegate* delegate) {
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
+void BookmarkEditor::Show(gfx::NativeView parent_window,
+                          Profile* profile,
+                          const BookmarkNode* parent,
+                          const BookmarkNode* node,
+                          Configuration configuration,
+                          Handler* handler) {
+  NOTIMPLEMENTED();
+}
+
+void BookmarkManager::SelectInTree(Profile* profile, const BookmarkNode* node) {
+}
+void BookmarkManager::Show(Profile* profile) {
+}
+
 #endif
diff --git a/views/controls/single_split_view.cc b/views/controls/single_split_view.cc
index c0e6e3c..3f52052 100644
--- a/views/controls/single_split_view.cc
+++ b/views/controls/single_split_view.cc
@@ -24,9 +24,11 @@ SingleSplitView::SingleSplitView(View* leading,
       divider_offset_(-1) {
   AddChildView(leading);
   AddChildView(trailing);
+#if defined(OS_WIN)
   set_background(
       views::Background::CreateSolidBackground(
           skia::COLORREFToSkColor(GetSysColor(COLOR_3DFACE))));
+#endif
 }
 
 void SingleSplitView::Layout() {
diff --git a/views/views.gyp b/views/views.gyp
index 8715403..abb790f 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -269,7 +269,6 @@
             'controls/scrollbar/native_scroll_bar.cc',
             'controls/button/radio_button.cc',
             'controls/separator.cc',
-            'controls/single_split_view.cc',
             'controls/tabbed_pane.cc',
             'controls/table/table_model.cc',
             'controls/table/table_view.cc',