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

Side by Side Diff: chrome/browser/views/generic_info_view_unittest.cc

Issue 3058027: Add #include utf_string_conversions.h to all files that use ASCIIToWide and... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/l10n_util.h" 5 #include "app/l10n_util.h"
6 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/views/generic_info_view.h" 7 #include "chrome/browser/views/generic_info_view.h"
7 #include "grit/chromium_strings.h" 8 #include "grit/chromium_strings.h"
8 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
9 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
10 #include "views/controls/label.h" 11 #include "views/controls/label.h"
11 #include "views/controls/textfield/textfield.h" 12 #include "views/controls/textfield/textfield.h"
12 #include "views/widget/root_view.h" 13 #include "views/widget/root_view.h"
13 #if defined(OS_WIN) 14 #if defined(OS_WIN)
14 #include "views/widget/widget_win.h" 15 #include "views/widget/widget_win.h"
15 #endif 16 #endif
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 }; 54 };
54 GenericInfoView* view2 = new GenericInfoView(ARRAYSIZE(kNameIds), kNameIds); 55 GenericInfoView* view2 = new GenericInfoView(ARRAYSIZE(kNameIds), kNameIds);
55 root_view->AddChildView(view2); 56 root_view->AddChildView(view2);
56 57
57 string16 product_name = l10n_util::GetString(IDS_PRODUCT_NAME); 58 string16 product_name = l10n_util::GetString(IDS_PRODUCT_NAME);
58 string16 product_desc = l10n_util::GetString(IDS_PRODUCT_DESCRIPTION); 59 string16 product_desc = l10n_util::GetString(IDS_PRODUCT_DESCRIPTION);
59 EXPECT_EQ(product_name, view2->name_views_[0]->GetText()); 60 EXPECT_EQ(product_name, view2->name_views_[0]->GetText());
60 EXPECT_EQ(product_desc, view2->name_views_[1]->GetText()); 61 EXPECT_EQ(product_desc, view2->name_views_[1]->GetText());
61 } 62 }
62 #endif // OS_WIN 63 #endif // OS_WIN
OLDNEW
« no previous file with comments | « chrome/browser/views/find_bar_host_interactive_uitest.cc ('k') | chrome/browser/views/ssl_client_certificate_selector_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698