chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc - Issue 13460012: Move IconsHandler from c/c/e/api/ to c/c/e

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/script_badge_manifest_unittest.cc

Issue 13460012: Move IconsHandler from c/c/e/api/ to c/c/e (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Latest master for CQ Created 7 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

« no previous file with comments | « chrome/common/extensions/api/extension_action/script_badge_handler.cc ('k') | chrome/common/extensions/api/icons/icons_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/api/extension_action/script_badge_handler.h"	6 #include "chrome/common/extensions/api/extension_action/script_badge_handler.h"

7 #include "chrome/common/extensions/api/icons/icons_handler.h"

8 #include "chrome/common/extensions/extension_builder.h"	7 #include "chrome/common/extensions/extension_builder.h"

9 #include "chrome/common/extensions/extension_constants.h"	8 #include "chrome/common/extensions/extension_constants.h"

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

11 #include "chrome/common/extensions/extension_manifest_constants.h"	10 #include "chrome/common/extensions/extension_manifest_constants.h"

12 #include "chrome/common/extensions/feature_switch.h"	11 #include "chrome/common/extensions/feature_switch.h"

	12 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"

13 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"	13 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"

14 #include "extensions/common/install_warning.h"	14 #include "extensions/common/install_warning.h"

15 #include "testing/gmock/include/gmock/gmock.h"	15 #include "testing/gmock/include/gmock/gmock.h"

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

17	17

18 namespace errors = extension_manifest_errors;	18 namespace errors = extension_manifest_errors;

19	19

20 namespace extensions {	20 namespace extensions {

21	21

22 namespace {	22 namespace {

(...skipping 124 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
147 EXPECT_EQ(2u, default_icon.map().size());	147 EXPECT_EQ(2u, default_icon.map().size());

148 EXPECT_EQ("icon128.png",	148 EXPECT_EQ("icon128.png",

149 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY,	149 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY,

150 ExtensionIconSet::MATCH_EXACTLY));	150 ExtensionIconSet::MATCH_EXACTLY));

151 EXPECT_EQ("icon128.png",	151 EXPECT_EQ("icon128.png",

152 default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY,	152 default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY,

153 ExtensionIconSet::MATCH_EXACTLY));	153 ExtensionIconSet::MATCH_EXACTLY));

154 }	154 }

155	155

156 } // namespace extensions	156 } // namespace extensions

OLD	NEW