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

Side by Side Diff: chrome/browser/ui/intents/web_intent_picker_model.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, 9 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 | Annotate | Revision Log
OLDNEW
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/browser/ui/intents/web_intent_picker_model.h" 5 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h" 9 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
10 #include "grit/ui_resources.h" 10 #include "grit/ui_resources.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 const WebIntentPickerModel::SuggestedExtension& 85 const WebIntentPickerModel::SuggestedExtension&
86 WebIntentPickerModel::GetSuggestedExtensionAt(size_t index) const { 86 WebIntentPickerModel::GetSuggestedExtensionAt(size_t index) const {
87 DCHECK(index < suggested_extensions_.size()); 87 DCHECK(index < suggested_extensions_.size());
88 return *suggested_extensions_[index]; 88 return *suggested_extensions_[index];
89 } 89 }
90 90
91 size_t WebIntentPickerModel::GetSuggestedExtensionCount() const { 91 size_t WebIntentPickerModel::GetSuggestedExtensionCount() const {
92 return suggested_extensions_.size(); 92 return suggested_extensions_.size();
93 } 93 }
94 94
95 void WebIntentPickerModel::SetSuggestedExtensionIconWithId(
96 const string16& id,
97 const gfx::Image& image) {
98 for (size_t i = 0; i < suggested_extensions_.size(); ++i) {
99 SuggestedExtension* extension = suggested_extensions_[i];
100 if (extension->id == id) {
101 extension->icon = image;
102
103 if (observer_)
104 observer_->OnExtensionIconChanged(this, extension->id);
105 break;
106 }
107 }
108 }
109
95 void WebIntentPickerModel::SetInlineDisposition(size_t index) { 110 void WebIntentPickerModel::SetInlineDisposition(size_t index) {
96 DCHECK(index < installed_services_.size()); 111 DCHECK(index < installed_services_.size());
97 inline_disposition_index_ = index; 112 inline_disposition_index_ = index;
98 if (observer_) 113 if (observer_)
99 observer_->OnInlineDisposition(this); 114 observer_->OnInlineDisposition(this);
100 } 115 }
101 116
102 bool WebIntentPickerModel::IsInlineDisposition() const { 117 bool WebIntentPickerModel::IsInlineDisposition() const {
103 return inline_disposition_index_ != std::string::npos; 118 return inline_disposition_index_ != std::string::npos;
104 } 119 }
(...skipping 23 matching lines...) Expand all
128 double average_rating) 143 double average_rating)
129 : title(title), 144 : title(title),
130 id(id), 145 id(id),
131 average_rating(average_rating), 146 average_rating(average_rating),
132 icon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed( 147 icon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
133 IDR_DEFAULT_FAVICON)) { 148 IDR_DEFAULT_FAVICON)) {
134 } 149 }
135 150
136 WebIntentPickerModel::SuggestedExtension::~SuggestedExtension() { 151 WebIntentPickerModel::SuggestedExtension::~SuggestedExtension() {
137 } 152 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_model.h ('k') | chrome/browser/ui/intents/web_intent_picker_model_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698