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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc

Issue 312093007: Revert of Added BookmarkClient::CanBeEditedByUser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 AddTestData(); 44 AddTestData();
45 } 45 }
46 46
47 virtual void TearDown() { 47 virtual void TearDown() {
48 } 48 }
49 49
50 protected: 50 protected:
51 std::string base_path() const { return "file:///c:/tmp/"; } 51 std::string base_path() const { return "file:///c:/tmp/"; }
52 52
53 const BookmarkNode* GetNode(const std::string& name) { 53 const BookmarkNode* GetNode(const std::string& name) {
54 return model_->GetMostRecentlyAddedUserNodeForURL(GURL(base_path() + name)); 54 return model_->GetMostRecentlyAddedNodeForURL(GURL(base_path() + name));
55 } 55 }
56 56
57 BookmarkNode* GetMutableNode(const std::string& name) { 57 BookmarkNode* GetMutableNode(const std::string& name) {
58 return const_cast<BookmarkNode*>(GetNode(name)); 58 return const_cast<BookmarkNode*>(GetNode(name));
59 } 59 }
60 60
61 BookmarkEditorView::EditorTreeModel* editor_tree_model() { 61 BookmarkEditorView::EditorTreeModel* editor_tree_model() {
62 return editor_->tree_model_.get(); 62 return editor_->tree_model_.get();
63 } 63 }
64 64
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 ASSERT_TRUE(tree_view()->editor() != NULL); 426 ASSERT_TRUE(tree_view()->editor() != NULL);
427 tree_view()->editor()->SetText(ASCIIToUTF16("modified")); 427 tree_view()->editor()->SetText(ASCIIToUTF16("modified"));
428 ApplyEdits(); 428 ApplyEdits();
429 429
430 // Verify the new folder was added and title set appropriately. 430 // Verify the new folder was added and title set appropriately.
431 ASSERT_EQ(1, parent->child_count()); 431 ASSERT_EQ(1, parent->child_count());
432 const BookmarkNode* new_folder = parent->GetChild(0); 432 const BookmarkNode* new_folder = parent->GetChild(0);
433 ASSERT_TRUE(new_folder->is_folder()); 433 ASSERT_TRUE(new_folder->is_folder());
434 EXPECT_EQ("modified", base::UTF16ToASCII(new_folder->GetTitle())); 434 EXPECT_EQ("modified", base::UTF16ToASCII(new_folder->GetTitle()));
435 } 435 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc ('k') | components/bookmarks/browser/bookmark_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698