chrome/chrome_browser_ui.gypi - Issue 1413153007: arc-app-launcher: Minimal support for ARC app launcher.

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/chrome_browser_ui.gypi

Issue 1413153007: arc-app-launcher: Minimal support for ARC app launcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 5 years 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

« chrome/browser/ui/app_list/extension_app_model_builder.cc ('K') | « chrome/browser/ui/app_list/extension_app_model_builder.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser_ui.gypi

diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi

index 112ad6d843377484449ecf7a7a7469aeda6b575d..897aa7036373df0ddd51ea1a88400d7cf356e57e 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -720,6 +720,19 @@

'browser/ui/views/select_file_dialog_extension_factory.cc',

'browser/ui/views/select_file_dialog_extension_factory.h',

+ # ARC-only sources.

+ 'chrome_browser_ui_chromeos_arc_sources': [

+ 'browser/ui/app_list/arc/arc_app_icon.cc',

+ 'browser/ui/app_list/arc/arc_app_icon.h',

+ 'browser/ui/app_list/arc/arc_app_item.cc',

+ 'browser/ui/app_list/arc/arc_app_item.h',

+ 'browser/ui/app_list/arc/arc_app_list_prefs_factory.cc',

+ 'browser/ui/app_list/arc/arc_app_list_prefs_factory.h',

+ 'browser/ui/app_list/arc/arc_app_list_prefs.cc',

+ 'browser/ui/app_list/arc/arc_app_list_prefs.h',

+ 'browser/ui/app_list/arc/arc_app_model_builder.cc',

+ 'browser/ui/app_list/arc/arc_app_model_builder.h',

+ ],

# ChromeOS sources that should not be included in the official build.

'chrome_browser_ui_chromeos_non_official_sources': [

'browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc',

@@ -2541,6 +2554,8 @@

'browser/ui/app_list/app_list_controller_delegate_impl.h',

'browser/ui/app_list/app_list_icon_win.cc',

'browser/ui/app_list/app_list_icon_win.h',

+ 'browser/ui/app_list/app_list_model_builder.cc',

+ 'browser/ui/app_list/app_list_model_builder.h',

'browser/ui/app_list/app_list_positioner.cc',

'browser/ui/app_list/app_list_positioner.h',

'browser/ui/app_list/app_list_prefs.cc',

@@ -2953,6 +2968,9 @@

'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',

}],

+ ['enable_app_list==1 and chromeos==1', {

+ 'sources': [ '<@(chrome_browser_ui_chromeos_arc_sources)' ],

+ }],

['use_cups==1', {

'dependencies': [

'../printing/printing.gyp:cups',