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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « athena/content/content_activity_factory.cc ('k') | athena/content/public/content_activity_factory.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "athena/content/public/content_app_model_builder.h"	5 #include "athena/content/public/content_app_model_builder.h"

6	6

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

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

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

10 #include "extensions/browser/extension_icon_image.h"	9 #include "extensions/browser/extension_icon_image.h"

11 #include "extensions/common/constants.h"	10 #include "extensions/common/constants.h"

12 #include "extensions/common/extension.h"	11 #include "extensions/common/extension.h"

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

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

14 #include "ui/app_list/app_list_item.h"	14 #include "ui/app_list/app_list_item.h"

15 #include "ui/app_list/app_list_model.h"	15 #include "ui/app_list/app_list_model.h"

16	16

17 using extensions::ShellExtensionSystem;	17 using extensions::ShellExtensionSystem;

18	18

19 namespace athena {	19 namespace athena {

20	20

21 namespace {	21 namespace {

22	22

23 ShellExtensionSystem* GetShellExtensionSystem(	23 ShellExtensionSystem* GetShellExtensionSystem(

(...skipping 99 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
123	123

124 ShellExtensionSystem* extension_system =	124 ShellExtensionSystem* extension_system =

125 GetShellExtensionSystem(browser_context_);	125 GetShellExtensionSystem(browser_context_);

126 if (extension_system && extension_system->extension()) {	126 if (extension_system && extension_system->extension()) {

127 model->AddItem(scoped_ptr<app_list::AppListItem>(	127 model->AddItem(scoped_ptr<app_list::AppListItem>(

128 new AppItem(extension_system->extension(), browser_context_)));	128 new AppItem(extension_system->extension(), browser_context_)));

129 }	129 }

130 }	130 }

131	131

132 } // namespace athena	132 } // namespace athena

OLD	NEW