| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/browser/extensions/bookmark_app_helper.h" | 5 #include "chrome/browser/extensions/bookmark_app_helper.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/extensions/extension_service_unittest.h" | 8 #include "chrome/browser/extensions/extension_service_unittest.h" |
| 9 #include "chrome/common/extensions/extension_icon_set.h" | |
| 10 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" | 9 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" |
| 11 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" | 10 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" |
| 12 #include "chrome/test/base/testing_profile.h" | 11 #include "chrome/test/base/testing_profile.h" |
| 13 #include "extensions/browser/extension_registry.h" | 12 #include "extensions/browser/extension_registry.h" |
| 13 #include "extensions/common/extension_icon_set.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
| 15 #include "third_party/skia/include/core/SkBitmap.h" | 15 #include "third_party/skia/include/core/SkBitmap.h" |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 #if !defined(OS_ANDROID) | 19 #if !defined(OS_ANDROID) |
| 20 const char kAppUrl[] = "http://www.chromium.org"; | 20 const char kAppUrl[] = "http://www.chromium.org"; |
| 21 const char kAppTitle[] = "Test title"; | 21 const char kAppTitle[] = "Test title"; |
| 22 const char kAlternativeAppTitle[] = "Different test title"; | 22 const char kAlternativeAppTitle[] = "Different test title"; |
| 23 const char kAppDescription[] = "Test description"; | 23 const char kAppDescription[] = "Test description"; |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 } | 245 } |
| 246 { | 246 { |
| 247 // The 32x32 icon should not be generated with no base icons. | 247 // The 32x32 icon should not be generated with no base icons. |
| 248 std::map<int, SkBitmap> bitmaps; | 248 std::map<int, SkBitmap> bitmaps; |
| 249 BookmarkAppHelper::GenerateContainerIcon(&bitmaps, 32); | 249 BookmarkAppHelper::GenerateContainerIcon(&bitmaps, 32); |
| 250 EXPECT_EQ(0u, bitmaps.count(32)); | 250 EXPECT_EQ(0u, bitmaps.count(32)); |
| 251 } | 251 } |
| 252 } | 252 } |
| 253 | 253 |
| 254 } // namespace extensions | 254 } // namespace extensions |
| OLD | NEW |