athena/content/content_app_model_builder.cc - Issue 412713002: Move apps/shell to extensions/shell.

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: athena/content/content_app_model_builder.cc

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 40% Created 6 years, 5 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: athena/content/content_app_model_builder.cc

diff --git a/athena/content/content_app_model_builder.cc b/athena/content/content_app_model_builder.cc

index c90304d65e60c2b5f654fc4dd87b410775876355..d8a361615bb02b206970f497a5e5eaaf79948c17 100644

--- a/athena/content/content_app_model_builder.cc

+++ b/athena/content/content_app_model_builder.cc

@@ -4,13 +4,13 @@

#include "athena/content/public/content_app_model_builder.h"

-#include "apps/shell/browser/shell_extension_system.h"

#include "athena/activity/public/activity_factory.h"

#include "athena/activity/public/activity_manager.h"

#include "extensions/browser/extension_icon_image.h"

#include "extensions/common/constants.h"

#include "extensions/common/extension.h"

#include "extensions/common/manifest_handlers/icons_handler.h"

+#include "extensions/shell/browser/shell_extension_system.h"

#include "ui/app_list/app_list_item.h"

#include "ui/app_list/app_list_model.h"