Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Unified Diff: chrome/browser/ui/intents/web_intent_picker_model_unittest.cc

Issue 9430025: [Web Intents] WebIntentsPickerController will now fetch icon for suggested extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/intents/web_intent_picker_model_unittest.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_model_unittest.cc b/chrome/browser/ui/intents/web_intent_picker_model_unittest.cc
index a6f95d5edf35ef464e24b1bffdc6d8dcf34bf346..852838e529feb37c8f5280dbf43b46bb3e57256f 100644
--- a/chrome/browser/ui/intents/web_intent_picker_model_unittest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_model_unittest.cc
@@ -33,6 +33,8 @@ class WebIntentPickerModelObserverMock : public WebIntentPickerModelObserver {
MOCK_METHOD1(OnModelChanged, void(WebIntentPickerModel* model));
MOCK_METHOD2(OnFaviconChanged,
void(WebIntentPickerModel* model, size_t index));
+ MOCK_METHOD2(OnExtensionIconChanged,
+ void(WebIntentPickerModel* model, const string16& extension_id));
MOCK_METHOD1(OnInlineDisposition, void(WebIntentPickerModel* model));
};
@@ -135,6 +137,22 @@ TEST_F(WebIntentPickerModelTest, RemoveSuggestedExtensionAt) {
EXPECT_EQ(kId3, model_.GetSuggestedExtensionAt(1).id);
}
+TEST_F(WebIntentPickerModelTest, SetSuggestedExtensionIconWithId) {
+ EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(2);
+ EXPECT_CALL(observer_, OnExtensionIconChanged(&model_, kId2)).Times(1);
+
+ model_.AddSuggestedExtension(kTitle1, kId1, 3.0);
+ model_.AddSuggestedExtension(kTitle2, kId2, 4.3);
+
+ gfx::Image image(gfx::test::CreateImage());
+ model_.SetSuggestedExtensionIconWithId(kId2, image);
+
+ EXPECT_FALSE(gfx::test::IsEqual(
+ image, model_.GetSuggestedExtensionAt(0).icon));
+ EXPECT_TRUE(gfx::test::IsEqual(
+ image, model_.GetSuggestedExtensionAt(1).icon));
+}
+
TEST_F(WebIntentPickerModelTest, SetInlineDisposition) {
EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(3);
EXPECT_CALL(observer_, OnInlineDisposition(&model_)).Times(1);
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_model_observer.h ('k') | chrome/browser/ui/views/web_intent_picker_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698