chrome/chrome_browser_ui.gypi - Issue 1921403002: Pin apps from prefs on the mash shelf.

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 1921403002: Pin apps from prefs on the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Only use ChromeMashShelfController with use_ash=1. Created 4 years, 8 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

Index: chrome/chrome_browser_ui.gypi

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

index 670959c3ad4c81e9d0433b7fbe19c86621a08c40..aa50e6d17dd160d4eeca11a08837a0b67c2def40 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -529,6 +529,8 @@

'browser/ui/ash/cast_config_delegate_media_router.h',

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

'browser/ui/ash/chrome_keyboard_ui.h',

+ 'browser/ui/ash/chrome_launcher_prefs.cc',

+ 'browser/ui/ash/chrome_launcher_prefs.h',

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

'browser/ui/ash/chrome_new_window_delegate.h',

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

@@ -571,14 +573,14 @@

'browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h',

'browser/ui/ash/launcher/extension_launcher_context_menu.cc',

'browser/ui/ash/launcher/extension_launcher_context_menu.h',

- 'browser/ui/ash/launcher/launcher_app_tab_helper.cc',

- 'browser/ui/ash/launcher/launcher_app_tab_helper.h',

'browser/ui/ash/launcher/launcher_app_updater.cc',

'browser/ui/ash/launcher/launcher_app_updater.h',

'browser/ui/ash/launcher/launcher_application_menu_item_model.cc',

'browser/ui/ash/launcher/launcher_application_menu_item_model.h',

'browser/ui/ash/launcher/launcher_context_menu.cc',

'browser/ui/ash/launcher/launcher_context_menu.h',

+ 'browser/ui/ash/launcher/launcher_controller_helper.cc',

+ 'browser/ui/ash/launcher/launcher_controller_helper.h',

'browser/ui/ash/launcher/launcher_extension_app_updater.cc',

'browser/ui/ash/launcher/launcher_extension_app_updater.h',

'browser/ui/ash/launcher/launcher_favicon_loader.cc',

@@ -665,8 +667,6 @@

# Cross-platform aura sources.

'chrome_browser_ui_aura_sources': [

- 'browser/ui/ash/chrome_launcher_prefs.cc',

- 'browser/ui/ash/chrome_launcher_prefs.h',

'browser/ui/aura/accessibility/automation_manager_aura.cc',

'browser/ui/aura/accessibility/automation_manager_aura.h',

'browser/ui/aura/accessibility/ax_root_obj_wrapper.cc',

« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_item_controller.cc ('k') | mash/shelf/public/interfaces/shelf.mojom » ('j') | no next file with comments »