chrome/chrome_browser_ui.gypi - Issue 634313004: Display dialog when app install succeeds / fails on Athena

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 634313004: Display dialog when app install succeeds / fails on Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/extensions/extension_install_ui_factory.h ('K') | « chrome/chrome_browser_extensions.gypi ('k') | extensions/browser/install/crx_installer_error.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 880cbf8f341b901a2ae94c1ddcb3b3cf9855108b..9885de659675233156851cea2ea5b50a1abc24a9 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -1419,6 +1419,7 @@

'browser/ui/extensions/application_launch.h',

'browser/ui/extensions/extension_install_ui_default.cc',

'browser/ui/extensions/extension_install_ui_default.h',

+ 'browser/ui/extensions/extension_install_ui_factory.h',

'browser/ui/fast_unload_controller.cc',

'browser/ui/fast_unload_controller.h',

'browser/ui/find_bar/find_bar_controller.cc',

@@ -2456,11 +2457,16 @@

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

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

+ # Used when not using android and not using Athena.

+ 'chrome_browser_ui_non_athena_non_android_sources': [

Ken Rockot(use gerrit already) 2014/10/15 22:20:08 This is extremely unfortunate. I would like this t

+ 'browser/ui/extensions/extension_install_ui_factory.cc',

+ ],

# Used when athena is enabled.

'chrome_browser_ui_athena_sources': [

#TODO(mukai): Port AppListService to Athena (crbug.com/417571)

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

+ 'browser/ui/athena/extensions/extension_install_ui_factory_athena.cc',

'browser/ui/views/athena/athena_util.cc',

'browser/ui/views/athena/athena_util.h',

'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc',

@@ -2732,6 +2738,9 @@

}, { # use_athena==0

'conditions': [

+ ['OS!="android"', {

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

+ }],

['use_ash==1', {

'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ],

}],