summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-03 22:49:26 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-03 22:49:26 +0000
commitcc09e6d788bcd9f2c3a2b2c32e41be62634c8673 (patch)
treea0b82e783a8ea5b29725b7a72d83455dd77ac682 /chrome/browser/bookmarks
parent649f3a5d65594046164d0bc44acae34e8d7a8e5b (diff)
downloadchromium_src-cc09e6d788bcd9f2c3a2b2c32e41be62634c8673.zip
chromium_src-cc09e6d788bcd9f2c3a2b2c32e41be62634c8673.tar.gz
chromium_src-cc09e6d788bcd9f2c3a2b2c32e41be62634c8673.tar.bz2
Fix toolkit_views build.
Review URL: http://codereview.chromium.org/119119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/bookmark_context_menu.cc8
1 files changed, 4 insertions, 4 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";