| 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" |
| 11 #include "chrome/common/extensions/feature_switch.h" |
| 11 #include "chrome/common/extensions/manifest_handler.h" | 12 #include "chrome/common/extensions/manifest_handler.h" |
| 12 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" | 13 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" |
| 13 #include "testing/gmock/include/gmock/gmock.h" | 14 #include "testing/gmock/include/gmock/gmock.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 15 | 16 |
| 16 namespace errors = extension_manifest_errors; | 17 namespace errors = extension_manifest_errors; |
| 17 | 18 |
| 18 namespace extensions { | 19 namespace extensions { |
| 19 | 20 |
| 20 namespace { | 21 namespace { |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 EXPECT_EQ(2u, default_icon.map().size()); | 148 EXPECT_EQ(2u, default_icon.map().size()); |
| 148 EXPECT_EQ("icon128.png", | 149 EXPECT_EQ("icon128.png", |
| 149 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY, | 150 default_icon.Get(extension_misc::EXTENSION_ICON_BITTY, |
| 150 ExtensionIconSet::MATCH_EXACTLY)); | 151 ExtensionIconSet::MATCH_EXACTLY)); |
| 151 EXPECT_EQ("icon128.png", | 152 EXPECT_EQ("icon128.png", |
| 152 default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY, | 153 default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY, |
| 153 ExtensionIconSet::MATCH_EXACTLY)); | 154 ExtensionIconSet::MATCH_EXACTLY)); |
| 154 } | 155 } |
| 155 | 156 |
| 156 } // namespace extensions | 157 } // namespace extensions |
| OLD | NEW |