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

Unified Diff: chrome/browser/ui/app_list/apps_model_builder.cc

Issue 10900018: Introduce App Launcher for Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: First round of feedback Created 8 years, 4 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/app_list/apps_model_builder.cc
diff --git a/chrome/browser/ui/app_list/apps_model_builder.cc b/chrome/browser/ui/app_list/apps_model_builder.cc
index 9448c0dea774dfbf6e3cc985805f708c885cc666..608968dcff820b789404118dba187fa11ece5870 100644
--- a/chrome/browser/ui/app_list/apps_model_builder.cc
+++ b/chrome/browser/ui/app_list/apps_model_builder.cc
@@ -19,6 +19,7 @@ using extensions::Extension;
namespace {
+// TODO(benwells): Get the list of special apps from the controller.
xiyuan 2012/08/30 16:50:51 Please hold off doing this or ping me before you s
benwells 2012/09/04 04:47:59 OK, I'll ping you before touching this.
const char* kSpecialApps[] = {
extension_misc::kChromeAppId,
extension_misc::kWebStoreAppId,
@@ -154,7 +155,8 @@ void AppsModelBuilder::CreateSpecialApps() {
continue;
const Extension* extension = service->GetInstalledExtension(extension_id);
- DCHECK(extension);
+ if (!extension)
+ continue;
model_->Add(new ExtensionAppItem(profile_, extension, controller_));
}

Powered by Google App Engine
This is Rietveld 408576698