Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc

Issue 7076027: Couple more wrench menu issues. The patch I sent around a couple of (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Makes unit test compile Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
index 2b4eebc488c77edff9cafc6f8dd55653d87cd3a8..38c39189edf83ac627064012c98e06f6b7a9e89f 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
@@ -112,7 +112,7 @@ TEST_F(BookmarkContextMenuTest, DeleteURL) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
GURL url = model_->GetBookmarkBarNode()->GetChild(0)->GetURL();
ASSERT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
// Delete the URL.
@@ -136,7 +136,7 @@ TEST_F(BookmarkContextMenuTest, OpenAll) {
TEST_F(BookmarkContextMenuTest, EmptyNodes) {
BookmarkContextMenu controller(
NULL, profile_.get(), NULL, model_->other_node(),
- std::vector<const BookmarkNode*>());
+ std::vector<const BookmarkNode*>(), false);
EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_FALSE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -155,7 +155,7 @@ TEST_F(BookmarkContextMenuTest, SingleURL) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_TRUE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -174,7 +174,7 @@ TEST_F(BookmarkContextMenuTest, MultipleURLs) {
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(1)->GetChild(0));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_TRUE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -192,7 +192,7 @@ TEST_F(BookmarkContextMenuTest, SingleFolder) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_FALSE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -212,7 +212,7 @@ TEST_F(BookmarkContextMenuTest, MultipleEmptyFolders) {
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_FALSE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -232,7 +232,7 @@ TEST_F(BookmarkContextMenuTest, MultipleFoldersWithURLs) {
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(4));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_TRUE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -249,7 +249,7 @@ TEST_F(BookmarkContextMenuTest, DisableIncognito) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
profile_->set_incognito(true);
EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_INCOGNITO));
EXPECT_FALSE(
@@ -261,7 +261,7 @@ TEST_F(BookmarkContextMenuTest, DisabledItemsWithOtherNode) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->other_node());
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0], nodes);
+ NULL, profile_.get(), NULL, nodes[0], nodes, false);
EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_EDIT));
EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
}
@@ -270,7 +270,8 @@ TEST_F(BookmarkContextMenuTest, DisabledItemsWithOtherNode) {
// parent.
TEST_F(BookmarkContextMenuTest, EmptyNodesNullParent) {
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, NULL, std::vector<const BookmarkNode*>());
+ NULL, profile_.get(), NULL, NULL, std::vector<const BookmarkNode*>(),
+ false);
EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_FALSE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -287,7 +288,7 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
scoped_ptr<BookmarkContextMenu> controller(new BookmarkContextMenu(
- NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
EXPECT_TRUE(controller->IsCommandEnabled(IDC_COPY));
EXPECT_TRUE(controller->IsCommandEnabled(IDC_CUT));
@@ -295,7 +296,7 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
controller->ExecuteCommand(IDC_COPY);
controller.reset(new BookmarkContextMenu(
- NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
int old_count = model_->GetBookmarkBarNode()->child_count();
controller->ExecuteCommand(IDC_PASTE);
@@ -305,7 +306,7 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
model_->GetBookmarkBarNode()->GetChild(1)->GetURL());
controller.reset(new BookmarkContextMenu(
- NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
// Cut the URL.
controller->ExecuteCommand(IDC_CUT);
ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698