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/browser/background/background_application_list_model.h" | 5 #include "chrome/browser/background/background_application_list_model.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
12 #include "chrome/app/chrome_command_ids.h" | 12 #include "chrome/app/chrome_command_ids.h" |
13 #include "chrome/browser/background/background_mode_manager.h" | 13 #include "chrome/browser/background/background_mode_manager.h" |
14 #include "chrome/browser/background/background_contents_service.h" | 14 #include "chrome/browser/background/background_contents_service.h" |
15 #include "chrome/browser/background/background_contents_service_factory.h" | 15 #include "chrome/browser/background/background_contents_service_factory.h" |
16 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
17 #include "chrome/browser/extensions/extension_prefs.h" | 17 #include "chrome/browser/extensions/extension_prefs.h" |
18 #include "chrome/browser/extensions/extension_service.h" | 18 #include "chrome/browser/extensions/extension_service.h" |
19 #include "chrome/browser/extensions/image_loading_tracker.h" | 19 #include "chrome/browser/extensions/image_loading_tracker.h" |
20 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
21 #include "chrome/common/chrome_notification_types.h" | 21 #include "chrome/common/chrome_notification_types.h" |
22 #include "chrome/common/extensions/extension.h" | 22 #include "chrome/common/extensions/extension.h" |
23 #include "chrome/common/extensions/extension_icon_set.h" | 23 #include "chrome/common/extensions/extension_icon_set.h" |
24 #include "chrome/common/extensions/extension_resource.h" | 24 #include "chrome/common/extensions/extension_resource.h" |
25 #include "content/public/browser/notification_details.h" | 25 #include "content/public/browser/notification_details.h" |
26 #include "content/public/browser/notification_source.h" | 26 #include "content/public/browser/notification_source.h" |
27 #include "ui/base/l10n/l10n_util_collator.h" | 27 #include "ui/base/l10n/l10n_util_collator.h" |
28 #include "ui/gfx/image/image.h" | 28 #include "ui/gfx/image/image.h" |
29 | 29 |
30 using extensions::Extension; | |
31 using extensions::ExtensionList; | |
32 using extensions::UnloadedExtensionInfo; | |
33 using extensions::UpdatedExtensionPermissionsInfo; | |
34 | |
30 class ExtensionNameComparator { | 35 class ExtensionNameComparator { |
31 public: | 36 public: |
32 explicit ExtensionNameComparator(icu::Collator* collator); | 37 explicit ExtensionNameComparator(icu::Collator* collator); |
33 bool operator()(const Extension* x, const Extension* y); | 38 bool operator()(const Extension* x, |
sky
2012/05/14 15:00:07
Leave this the way it was.
mitchellwrosen
2012/05/18 22:53:16
Done.
| |
39 const Extension* y); | |
34 | 40 |
35 private: | 41 private: |
36 icu::Collator* collator_; | 42 icu::Collator* collator_; |
37 }; | 43 }; |
38 | 44 |
39 ExtensionNameComparator::ExtensionNameComparator(icu::Collator* collator) | 45 ExtensionNameComparator::ExtensionNameComparator(icu::Collator* collator) |
40 : collator_(collator) { | 46 : collator_(collator) { |
41 } | 47 } |
42 | 48 |
43 bool ExtensionNameComparator::operator()(const Extension* x, | 49 bool ExtensionNameComparator::operator()(const Extension* x, |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
221 | 227 |
222 const BackgroundApplicationListModel::Application* | 228 const BackgroundApplicationListModel::Application* |
223 BackgroundApplicationListModel::FindApplication( | 229 BackgroundApplicationListModel::FindApplication( |
224 const Extension* extension) const { | 230 const Extension* extension) const { |
225 const std::string& id = extension->id(); | 231 const std::string& id = extension->id(); |
226 ApplicationMap::const_iterator found = applications_.find(id); | 232 ApplicationMap::const_iterator found = applications_.find(id); |
227 return (found == applications_.end()) ? NULL : found->second; | 233 return (found == applications_.end()) ? NULL : found->second; |
228 } | 234 } |
229 | 235 |
230 BackgroundApplicationListModel::Application* | 236 BackgroundApplicationListModel::Application* |
231 BackgroundApplicationListModel::FindApplication(const Extension* extension) { | 237 BackgroundApplicationListModel::FindApplication( |
238 const Extension* extension) { | |
232 const std::string& id = extension->id(); | 239 const std::string& id = extension->id(); |
233 ApplicationMap::iterator found = applications_.find(id); | 240 ApplicationMap::iterator found = applications_.find(id); |
234 return (found == applications_.end()) ? NULL : found->second; | 241 return (found == applications_.end()) ? NULL : found->second; |
235 } | 242 } |
236 | 243 |
237 const SkBitmap* BackgroundApplicationListModel::GetIcon( | 244 const SkBitmap* BackgroundApplicationListModel::GetIcon( |
238 const Extension* extension) { | 245 const Extension* extension) { |
239 const Application* application = FindApplication(extension); | 246 const Application* application = FindApplication(extension); |
240 if (application) | 247 if (application) |
241 return application->icon_.get(); | 248 return application->icon_.get(); |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
396 (*old_cursor)->name() == (*new_cursor)->name() && | 403 (*old_cursor)->name() == (*new_cursor)->name() && |
397 (*old_cursor)->id() == (*new_cursor)->id()) { | 404 (*old_cursor)->id() == (*new_cursor)->id()) { |
398 ++old_cursor; | 405 ++old_cursor; |
399 ++new_cursor; | 406 ++new_cursor; |
400 } | 407 } |
401 if (old_cursor != extensions_.end() || new_cursor != extensions.end()) { | 408 if (old_cursor != extensions_.end() || new_cursor != extensions.end()) { |
402 extensions_ = extensions; | 409 extensions_ = extensions; |
403 FOR_EACH_OBSERVER(Observer, observers_, OnApplicationListChanged(profile_)); | 410 FOR_EACH_OBSERVER(Observer, observers_, OnApplicationListChanged(profile_)); |
404 } | 411 } |
405 } | 412 } |
OLD | NEW |