chrome/browser/ui/app_list/apps_model_builder.cc - Issue 10900018: Introduce App Launcher for Windows.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Rebase gyp file for ui extraction Created 8 years, 3 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:

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.

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_));

}