diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 01:11:41 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 01:11:41 +0000 |
| commit | f519c9482e9f8fc288162bf2775ad4cdb717695a (patch) | |
| tree | 69d210b7c8224d587992939787311aaac272dfb7 /views/focus | |
| parent | 769c7aa11e79e08bd367f6d8b97b09314ed55263 (diff) | |
| download | chromium_src-f519c9482e9f8fc288162bf2775ad4cdb717695a.zip chromium_src-f519c9482e9f8fc288162bf2775ad4cdb717695a.tar.gz chromium_src-f519c9482e9f8fc288162bf2775ad4cdb717695a.tar.bz2 | |
views: Change TabbedPane::AddTab() to string16.
BUG=68267
R=sky@chromium.org
Review URL: http://codereview.chromium.org/8068009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus')
| -rw-r--r-- | views/focus/focus_manager_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc index 58d8bbc..4f8ca5c 100644 --- a/views/focus/focus_manager_unittest.cc +++ b/views/focus/focus_manager_unittest.cc @@ -695,8 +695,8 @@ void FocusTraversalTest::InitContentView() { style_tab_->set_id(kStyleContainerID); content_view_->AddChildView(style_tab_); style_tab_->SetBounds(10, y, 210, 100); - style_tab_->AddTab(L"Style", contents); - style_tab_->AddTab(L"Other", new View()); + style_tab_->AddTab(ASCIIToUTF16("Style"), contents); + style_tab_->AddTab(ASCIIToUTF16("Other"), new View()); // Right bottom box with search. contents = new View(); @@ -938,7 +938,7 @@ TEST_F(FocusManagerTest, FAILS_FocusNativeControls) { content_view_->AddChildView(textfield); content_view_->AddChildView(tabbed_pane); - tabbed_pane->AddTab(L"Awesome textfield", textfield2); + tabbed_pane->AddTab(ASCIIToUTF16("Awesome textfield"), textfield2); // Simulate the native view getting the native focus (such as by user click). FocusNativeView(textfield->TestGetNativeControlView()); @@ -1049,8 +1049,8 @@ TEST_F(FocusManagerTest, ContainsView) { content_view_->AddChildView(tabbed_pane); // Adding a View inside a TabbedPane to test the case of nested root view. - tabbed_pane->AddTab(L"Awesome tab", nested_tabbed_pane); - nested_tabbed_pane->AddTab(L"Awesomer tab", tab_button); + tabbed_pane->AddTab(ASCIIToUTF16("Awesome tab"), nested_tabbed_pane); + nested_tabbed_pane->AddTab(ASCIIToUTF16("Awesomer tab"), tab_button); EXPECT_TRUE(GetFocusManager()->ContainsView(view)); EXPECT_TRUE(GetFocusManager()->ContainsView(tabbed_pane)); @@ -1739,7 +1739,7 @@ TEST_F(FocusManagerDtorTest, FocusManagerDestructedLast) { NativeButtonDtorTracked* button = new NativeButtonDtorTracked(L"button", &dtor_tracker_); - tabbed_pane->AddTab(L"Awesome tab", button); + tabbed_pane->AddTab(ASCIIToUTF16("Awesome tab"), button); // Close the window. window_->Close(); |