| 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/extension_builder.h" | 7 #include "chrome/common/extensions/extension_builder.h" |
| 8 #include "chrome/common/extensions/extension_constants.h" | 8 #include "chrome/common/extensions/extension_constants.h" |
| 9 #include "chrome/common/extensions/extension_icon_set.h" | 9 #include "chrome/common/extensions/extension_icon_set.h" |
| 10 #include "chrome/common/extensions/extension_manifest_constants.h" | 10 #include "chrome/common/extensions/extension_manifest_constants.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 .Set("icons", DictionaryBuilder() | 51 .Set("icons", DictionaryBuilder() |
| 52 .Set("16", "icon16.png") | 52 .Set("16", "icon16.png") |
| 53 .Set("32", "icon32.png") | 53 .Set("32", "icon32.png") |
| 54 .Set("19", "icon19.png") | 54 .Set("19", "icon19.png") |
| 55 .Set("48", "icon48.png")) | 55 .Set("48", "icon48.png")) |
| 56 .Set("script_badge", DictionaryBuilder() | 56 .Set("script_badge", DictionaryBuilder() |
| 57 .Set("default_popup", "popup.html"))) | 57 .Set("default_popup", "popup.html"))) |
| 58 .Build()); | 58 .Build()); |
| 59 ASSERT_TRUE(extension.get()); | 59 ASSERT_TRUE(extension.get()); |
| 60 const ActionInfo* script_badge_info = | 60 const ActionInfo* script_badge_info = |
| 61 ScriptBadgeInfo::GetScriptBadge(extension); | 61 ActionInfoData::GetScriptBadgeInfo(extension); |
| 62 ASSERT_TRUE(script_badge_info); | 62 ASSERT_TRUE(script_badge_info); |
| 63 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()), | 63 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()), |
| 64 testing::ElementsAre(/*empty*/)); | 64 testing::ElementsAre(/*empty*/)); |
| 65 | 65 |
| 66 const ExtensionIconSet& default_icon = | 66 const ExtensionIconSet& default_icon = |
| 67 script_badge_info->default_icon; | 67 script_badge_info->default_icon; |
| 68 // Should have a default icon set. | 68 // Should have a default icon set. |
| 69 ASSERT_FALSE(default_icon.empty()); | 69 ASSERT_FALSE(default_icon.empty()); |
| 70 | 70 |
| 71 // Verify that correct icon paths are registered in default_icon. | 71 // Verify that correct icon paths are registered in default_icon. |
| (...skipping 19 matching lines...) Expand all Loading... |
| 91 .Set("description", | 91 .Set("description", |
| 92 "Check that a simple script_badge section parses") | 92 "Check that a simple script_badge section parses") |
| 93 .Set("icons", DictionaryBuilder() | 93 .Set("icons", DictionaryBuilder() |
| 94 .Set("16", "icon16.png")) | 94 .Set("16", "icon16.png")) |
| 95 .Set("script_badge", DictionaryBuilder() | 95 .Set("script_badge", DictionaryBuilder() |
| 96 .Set("default_title", "Other Extension") | 96 .Set("default_title", "Other Extension") |
| 97 .Set("default_icon", "malicious.png"))) | 97 .Set("default_icon", "malicious.png"))) |
| 98 .Build()); | 98 .Build()); |
| 99 ASSERT_TRUE(extension.get()); | 99 ASSERT_TRUE(extension.get()); |
| 100 const ActionInfo* script_badge_info = | 100 const ActionInfo* script_badge_info = |
| 101 ScriptBadgeInfo::GetScriptBadge(extension); | 101 ActionInfoData::GetScriptBadgeInfo(extension); |
| 102 ASSERT_TRUE(script_badge_info); | 102 ASSERT_TRUE(script_badge_info); |
| 103 | 103 |
| 104 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()), | 104 EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()), |
| 105 testing::ElementsAre( | 105 testing::ElementsAre( |
| 106 Extension::InstallWarning( | 106 Extension::InstallWarning( |
| 107 Extension::InstallWarning::FORMAT_TEXT, | 107 Extension::InstallWarning::FORMAT_TEXT, |
| 108 errors::kScriptBadgeTitleIgnored), | 108 errors::kScriptBadgeTitleIgnored), |
| 109 Extension::InstallWarning( | 109 Extension::InstallWarning( |
| 110 Extension::InstallWarning::FORMAT_TEXT, | 110 Extension::InstallWarning::FORMAT_TEXT, |
| 111 errors::kScriptBadgeIconIgnored))); | 111 errors::kScriptBadgeIconIgnored))); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 129 .Set("manifest_version", 2) | 129 .Set("manifest_version", 2) |
| 130 .Set("name", "my extension") | 130 .Set("name", "my extension") |
| 131 .Set("version", "1.0.0.0") | 131 .Set("version", "1.0.0.0") |
| 132 .Set("description", | 132 .Set("description", |
| 133 "Check that a simple script_badge section parses") | 133 "Check that a simple script_badge section parses") |
| 134 .Set("icons", DictionaryBuilder() | 134 .Set("icons", DictionaryBuilder() |
| 135 .Set("128", "icon128.png"))) | 135 .Set("128", "icon128.png"))) |
| 136 .Build()); | 136 .Build()); |
| 137 ASSERT_TRUE(extension.get()); | 137 ASSERT_TRUE(extension.get()); |
| 138 const ActionInfo* script_badge_info = | 138 const ActionInfo* script_badge_info = |
| 139 ScriptBadgeInfo::GetScriptBadge(extension); | 139 ActionInfoData::GetScriptBadgeInfo(extension); |
| 140 ASSERT_TRUE(script_badge_info); | 140 ASSERT_TRUE(script_badge_info); |
| 141 EXPECT_THAT(extension->install_warnings(), | 141 EXPECT_THAT(extension->install_warnings(), |
| 142 testing::ElementsAre(/*empty*/)); | 142 testing::ElementsAre(/*empty*/)); |
| 143 | 143 |
| 144 const ExtensionIconSet& default_icon = | 144 const ExtensionIconSet& default_icon = |
| 145 script_badge_info->default_icon; | 145 script_badge_info->default_icon; |
| 146 ASSERT_FALSE(default_icon.empty()) << "Should fall back to the 128px icon."; | 146 ASSERT_FALSE(default_icon.empty()) << "Should fall back to the 128px icon."; |
| 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 |