3 files changed, 15 insertions, 5 deletions
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.cc b/chrome/browser/bookmarks/bookmark_context_menu.cc
index 3b1247d..f453df7 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu.cc
@@ -106,7 +106,7 @@ class EditFolderController : public InputWindowDialog::Delegate,
       ALLOW_UNUSED BookmarkNode* node =
           model_->AddGroup(node_, node_->GetChildCount(), text);
       if (show_in_manager_) {
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS))
         BookmarkManager::SelectInTree(profile_, node);
 #else
         NOTIMPLEMENTED() << "BookmarkManager not yet implemented";
@@ -330,7 +330,7 @@ void BookmarkContextMenu::ExecuteCommand(int id) {
       }
 
       if (selection_[0]->is_url()) {
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS))
         BookmarkEditor::Configuration editor_config;
         if (configuration_ == BOOKMARK_BAR)
           editor_config = BookmarkEditor::SHOW_TREE;
@@ -401,7 +401,7 @@ void BookmarkContextMenu::ExecuteCommand(int id) {
         return;
       }
 
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS))
       BookmarkManager::SelectInTree(profile_, selection_[0]);
 #else
       NOTIMPLEMENTED() << "Bookmark Manager not implemented";
@@ -410,7 +410,7 @@ void BookmarkContextMenu::ExecuteCommand(int id) {
 
     case IDS_BOOKMARK_MANAGER:
       UserMetrics::RecordAction(L"ShowBookmarkManager", profile_);
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS))
       BookmarkManager::Show(profile_);
 #else
       NOTIMPLEMENTED() << "Bookmark Manager not implemented";
diff --git a/chrome/browser/dock_info_gtk.cc b/chrome/browser/dock_info_gtk.cc
index aadb417..688a2af 100644
--- a/chrome/browser/dock_info_gtk.cc
+++ b/chrome/browser/dock_info_gtk.cc
@@ -173,7 +173,9 @@ class LocalProcessWindowFinder : public BaseWindowFinder {
   DISALLOW_COPY_AND_ASSIGN(LocalProcessWindowFinder);
 };
 
+#if !defined(TOOLKIT_VIEWS)
 DockInfo::Factory* DockInfo::factory_ = NULL;
+#endif
 
 // static
 DockInfo DockInfo::GetDockInfoAtPoint(const gfx::Point& screen_point,
@@ -192,9 +194,13 @@ GtkWindow* DockInfo::GetLocalProcessWindowAtPoint(
   if (factory_)
     return factory_->GetLocalProcessWindowAtPoint(screen_point, ignore);
 
+#if !defined(TOOLKIT_VIEWS)
   XID xid =
-    LocalProcessWindowFinder::GetProcessWindowAtPoint(screen_point, ignore);
+      LocalProcessWindowFinder::GetProcessWindowAtPoint(screen_point, ignore);
   return BrowserWindowGtk::GetBrowserWindowForXID(xid);
+#else
+  return NULL;
+#endif
 }
 
 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const {
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index f60c7dd..a792b99 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -912,7 +912,11 @@ bool LocationBarView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
     return true;
   }
 
+#if defined(OS_WIN)
   return location_entry_->SkipDefaultKeyEventProcessing(e);
+#else
+  return false;
+#endif
 }
 
 // ShowInfoBubbleTask-----------------------------------------------------------