OLD | NEW |
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.h" | 9 #include "base/message_loop.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 return false; | 100 return false; |
101 return editor_->url_tf_->parent(); | 101 return editor_->url_tf_->parent(); |
102 } | 102 } |
103 | 103 |
104 void ExpandAndSelect() { | 104 void ExpandAndSelect() { |
105 editor_->ExpandAndSelect(); | 105 editor_->ExpandAndSelect(); |
106 } | 106 } |
107 | 107 |
108 views::TreeView* tree_view() { return editor_->tree_view_; } | 108 views::TreeView* tree_view() { return editor_->tree_view_; } |
109 | 109 |
110 MessageLoopForUI message_loop_; | 110 base::MessageLoopForUI message_loop_; |
111 content::TestBrowserThread ui_thread_; | 111 content::TestBrowserThread ui_thread_; |
112 content::TestBrowserThread file_thread_; | 112 content::TestBrowserThread file_thread_; |
113 | 113 |
114 BookmarkModel* model_; | 114 BookmarkModel* model_; |
115 scoped_ptr<TestingProfile> profile_; | 115 scoped_ptr<TestingProfile> profile_; |
116 | 116 |
117 private: | 117 private: |
118 // Creates the following structure: | 118 // Creates the following structure: |
119 // bookmark bar node | 119 // bookmark bar node |
120 // a | 120 // a |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
425 ASSERT_TRUE(tree_view()->editor() != NULL); | 425 ASSERT_TRUE(tree_view()->editor() != NULL); |
426 tree_view()->editor()->SetText(ASCIIToUTF16("modified")); | 426 tree_view()->editor()->SetText(ASCIIToUTF16("modified")); |
427 ApplyEdits(); | 427 ApplyEdits(); |
428 | 428 |
429 // Verify the new folder was added and title set appropriately. | 429 // Verify the new folder was added and title set appropriately. |
430 ASSERT_EQ(1, parent->child_count()); | 430 ASSERT_EQ(1, parent->child_count()); |
431 const BookmarkNode* new_folder = parent->GetChild(0); | 431 const BookmarkNode* new_folder = parent->GetChild(0); |
432 ASSERT_TRUE(new_folder->is_folder()); | 432 ASSERT_TRUE(new_folder->is_folder()); |
433 EXPECT_EQ("modified", UTF16ToASCII(new_folder->GetTitle())); | 433 EXPECT_EQ("modified", UTF16ToASCII(new_folder->GetTitle())); |
434 } | 434 } |
OLD | NEW |