chrome/chrome_browser_ui.gypi - Issue 12207104: Refactor app_list_util.h into AppListService abstract base.

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 12207104: Refactor app_list_util.h into AppListService abstract base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase (conflicts in webstore_private_api.cc) Created 7 years, 10 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

« chrome/browser/ui/ash/app_list/app_list_service_ash.cc ('K') | « chrome/browser/ui/webui/options/manage_profile_handler.cc ('k') | chrome/common/pref_names.h » ('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 2616f8fe2c73a4927419c9031a524501eee78ad3..206223fda25035ce5151356f45bd8c87f98af930 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -100,8 +100,13 @@

'browser/ui/android/window_android_helper.h',

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

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

- 'browser/ui/app_list/app_list_util.cc',

- 'browser/ui/app_list/app_list_util.h',

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

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

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

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

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

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

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

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

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

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

@@ -124,6 +129,7 @@

'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',

'browser/ui/ash/app_list/app_list_controller_ash.h',

'browser/ui/ash/app_list/app_list_controller_ash.cc',

+ 'browser/ui/ash/app_list/app_list_service_ash.cc',

'browser/ui/ash/app_list/app_sync_ui_state_watcher.cc',

'browser/ui/ash/app_list/app_sync_ui_state_watcher.h',

'browser/ui/ash/app_sync_ui_state.cc',

@@ -2802,10 +2808,16 @@

'dependencies': [

'../ui/app_list/app_list.gyp:app_list',

+ 'sources!': [

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

+ ]

}, { # else: enable_app_list==0

'sources/': [

['exclude', '^browser/ui/views/app_list/'],

['exclude', '^browser/ui/app_list/'],

+ ['include', '^browser/ui/app_list/app_list_service.h'],

+ ['include', '^browser/ui/app_list/app_list_service.cc'],

+ ['include', '^browser/ui/app_list/app_list_service_disabled.cc'],

]

}],

['enable_message_center==1', {