remoting/base/resources_unittest.cc - Issue 11359035: Revert 165605 - Fix branding in chromoting string resources.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: remoting/base/resources_unittest.cc

Issue 11359035: Revert 165605 - Fix branding in chromoting string resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 1 month 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

« no previous file with comments | « build/grit_action.gypi ('k') | remoting/grit_action.gypi » ('j') | no next file with comments »

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 "remoting/base/resources.h"	5 #include "remoting/base/resources.h"

6	6

7 #include "remoting/base/common_resources.h"	7 #include "remoting/base/common_resources.h"

8 #include "remoting/base/string_resources.h"	8 #include "remoting/base/string_resources.h"

9 #include "ui/base/l10n/l10n_util.h"	9 #include "ui/base/l10n/l10n_util.h"

10 #include "ui/base/resource/resource_bundle.h"	10 #include "ui/base/resource/resource_bundle.h"

(...skipping 22 matching lines...) Expand all Loading...
33 }	33 }

34 };	34 };

35	35

36 TEST_F(ResourcesTest, MAYBE_ProductName) {	36 TEST_F(ResourcesTest, MAYBE_ProductName) {

37 #if defined(GOOGLE_CHROME_BUILD)	37 #if defined(GOOGLE_CHROME_BUILD)

38 std::string expected_product_name = "Chrome Remote Desktop";	38 std::string expected_product_name = "Chrome Remote Desktop";

39 #else // defined(GOOGLE_CHROME_BUILD)	39 #else // defined(GOOGLE_CHROME_BUILD)

40 std::string expected_product_name = "Chromoting";	40 std::string expected_product_name = "Chromoting";

41 #endif // !defined(GOOGLE_CHROME_BUILD)	41 #endif // !defined(GOOGLE_CHROME_BUILD)

42 EXPECT_EQ(expected_product_name,	42 EXPECT_EQ(expected_product_name,

43 l10n_util::GetStringUTF8(IDR_PRODUCT_NAME));	43 l10n_util::GetStringUTF8(IDR_REMOTING_PRODUCT_NAME));

44 }	44 }

45	45

46 TEST_F(ResourcesTest, MAYBE_ProductLogo) {	46 TEST_F(ResourcesTest, MAYBE_ProductLogo) {

47 gfx::Image logo = ui::ResourceBundle::GetSharedInstance().GetImageNamed(	47 gfx::Image logo = ui::ResourceBundle::GetSharedInstance().GetImageNamed(

48 IDR_PRODUCT_LOGO_16);	48 IDR_PRODUCT_LOGO_16);

49 EXPECT_FALSE(logo.IsEmpty());	49 EXPECT_FALSE(logo.IsEmpty());

50 }	50 }

51	51

52 } // namespace remoting	52 } // namespace remoting

OLD	NEW