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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm

Issue 114883004: Add base:: namespace to straggling string16s left in chrome/browser/ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: found more Created 7 years 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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/strings/sys_string_conversions.h" 7 #include "base/strings/sys_string_conversions.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 model->AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com")); 47 model->AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com"));
48 model->AddURL(folder_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com")); 48 model->AddURL(folder_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com"));
49 } 49 }
50 50
51 virtual BookmarkAllTabsControllerOverride* CreateController() { 51 virtual BookmarkAllTabsControllerOverride* CreateController() {
52 return [[BookmarkAllTabsControllerOverride alloc] 52 return [[BookmarkAllTabsControllerOverride alloc]
53 initWithParentWindow:test_window() 53 initWithParentWindow:test_window()
54 profile:profile() 54 profile:profile()
55 parent:folder_a_ 55 parent:folder_a_
56 url:GURL() 56 url:GURL()
57 title:string16() 57 title:base::string16()
58 configuration:BookmarkEditor::SHOW_TREE]; 58 configuration:BookmarkEditor::SHOW_TREE];
59 } 59 }
60 60
61 virtual void SetUp() { 61 virtual void SetUp() {
62 CocoaProfileTest::SetUp(); 62 CocoaProfileTest::SetUp();
63 ASSERT_TRUE(profile()); 63 ASSERT_TRUE(profile());
64 64
65 CreateModel(); 65 CreateModel();
66 controller_ = CreateController(); 66 controller_ = CreateController();
67 [controller_ runAsModalSheet]; 67 [controller_ runAsModalSheet];
68 } 68 }
69 69
70 virtual void TearDown() { 70 virtual void TearDown() {
71 controller_ = NULL; 71 controller_ = NULL;
72 CocoaProfileTest::TearDown(); 72 CocoaProfileTest::TearDown();
73 } 73 }
74 }; 74 };
75 75
76 TEST_F(BookmarkAllTabsControllerTest, BookmarkAllTabs) { 76 TEST_F(BookmarkAllTabsControllerTest, BookmarkAllTabs) {
77 // OK button should always be enabled. 77 // OK button should always be enabled.
78 EXPECT_TRUE([controller_ okButtonEnabled]); 78 EXPECT_TRUE([controller_ okButtonEnabled]);
79 [controller_ selectTestNodeInBrowser:folder_a_]; 79 [controller_ selectTestNodeInBrowser:folder_a_];
80 [controller_ setDisplayName:@"ALL MY TABS"]; 80 [controller_ setDisplayName:@"ALL MY TABS"];
81 [controller_ ok:nil]; 81 [controller_ ok:nil];
82 EXPECT_EQ(4, folder_a_->child_count()); 82 EXPECT_EQ(4, folder_a_->child_count());
83 const BookmarkNode* folderChild = folder_a_->GetChild(3); 83 const BookmarkNode* folderChild = folder_a_->GetChild(3);
84 EXPECT_EQ(folderChild->GetTitle(), ASCIIToUTF16("ALL MY TABS")); 84 EXPECT_EQ(folderChild->GetTitle(), ASCIIToUTF16("ALL MY TABS"));
85 EXPECT_EQ(3, folderChild->child_count()); 85 EXPECT_EQ(3, folderChild->child_count());
86 } 86 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698