chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc - Issue 225043002: Move extension_icon_set.{h,cc} to //extensions

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: chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc

Issue 225043002: Move extension_icon_set.{h,cc} to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 8 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

« no previous file with comments | « chrome/common/extensions/api/extension_action/action_info.h ('k') | chrome/common/extensions/extension_file_util.cc » ('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 "chrome/common/extensions/api/extension_action/action_info.h"	5 #include "chrome/common/extensions/api/extension_action/action_info.h"

6 #include "chrome/common/extensions/extension_icon_set.h"

7 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"	6 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"

8 #include "extensions/common/error_utils.h"	7 #include "extensions/common/error_utils.h"

9 #include "extensions/common/extension_builder.h"	8 #include "extensions/common/extension_builder.h"

	9 #include "extensions/common/extension_icon_set.h"

10 #include "extensions/common/manifest_constants.h"	10 #include "extensions/common/manifest_constants.h"

11 #include "extensions/common/value_builder.h"	11 #include "extensions/common/value_builder.h"

12 #include "testing/gtest/include/gtest/gtest.h"	12 #include "testing/gtest/include/gtest/gtest.h"

13	13

14 namespace extensions {	14 namespace extensions {

15	15

16 namespace errors = manifest_errors;	16 namespace errors = manifest_errors;

17	17

18 namespace {	18 namespace {

19	19

(...skipping 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 .Set("24", "icon24.png").Set("38", "icon38.png"))).Build();	104 .Set("24", "icon24.png").Set("38", "icon38.png"))).Build();

105	105

106 base::string16 error = ErrorUtils::FormatErrorMessageUTF16(	106 base::string16 error = ErrorUtils::FormatErrorMessageUTF16(

107 errors::kInvalidIconPath, "19");	107 errors::kInvalidIconPath, "19");

108 LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"),	108 LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"),

109 errors::kInvalidIconPath);	109 errors::kInvalidIconPath);

110 }	110 }

111	111

112 } // namespace	112 } // namespace

113 } // namespace extensions	113 } // namespace extensions

OLD	NEW