Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side 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 unified diff | Download patch
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chrome_browser_ui_non_ios_sources': [ 7 'chrome_browser_ui_non_ios_sources': [
8 'browser/ui/accelerator_utils.h', 8 'browser/ui/accelerator_utils.h',
9 'browser/ui/android/android_about_app_info.cc', 9 'browser/ui/android/android_about_app_info.cc',
10 'browser/ui/android/android_about_app_info.h', 10 'browser/ui/android/android_about_app_info.h',
(...skipping 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after
1412 'browser/ui/content_settings/content_setting_image_model.cc', 1412 'browser/ui/content_settings/content_setting_image_model.cc',
1413 'browser/ui/content_settings/content_setting_image_model.h', 1413 'browser/ui/content_settings/content_setting_image_model.h',
1414 'browser/ui/content_settings/content_setting_media_menu_model.cc', 1414 'browser/ui/content_settings/content_setting_media_menu_model.cc',
1415 'browser/ui/content_settings/content_setting_media_menu_model.h', 1415 'browser/ui/content_settings/content_setting_media_menu_model.h',
1416 'browser/ui/elide_url.cc', 1416 'browser/ui/elide_url.cc',
1417 'browser/ui/elide_url.h', 1417 'browser/ui/elide_url.h',
1418 'browser/ui/extensions/application_launch.cc', 1418 'browser/ui/extensions/application_launch.cc',
1419 'browser/ui/extensions/application_launch.h', 1419 'browser/ui/extensions/application_launch.h',
1420 'browser/ui/extensions/extension_install_ui_default.cc', 1420 'browser/ui/extensions/extension_install_ui_default.cc',
1421 'browser/ui/extensions/extension_install_ui_default.h', 1421 'browser/ui/extensions/extension_install_ui_default.h',
1422 'browser/ui/extensions/extension_install_ui_factory.h',
1422 'browser/ui/fast_unload_controller.cc', 1423 'browser/ui/fast_unload_controller.cc',
1423 'browser/ui/fast_unload_controller.h', 1424 'browser/ui/fast_unload_controller.h',
1424 'browser/ui/find_bar/find_bar_controller.cc', 1425 'browser/ui/find_bar/find_bar_controller.cc',
1425 'browser/ui/find_bar/find_bar_controller.h', 1426 'browser/ui/find_bar/find_bar_controller.h',
1426 'browser/ui/fullscreen/fullscreen_controller.cc', 1427 'browser/ui/fullscreen/fullscreen_controller.cc',
1427 'browser/ui/fullscreen/fullscreen_controller.h', 1428 'browser/ui/fullscreen/fullscreen_controller.h',
1428 'browser/ui/fullscreen/fullscreen_exit_bubble.cc', 1429 'browser/ui/fullscreen/fullscreen_exit_bubble.cc',
1429 'browser/ui/fullscreen/fullscreen_exit_bubble.h', 1430 'browser/ui/fullscreen/fullscreen_exit_bubble.h',
1430 'browser/ui/fullscreen/fullscreen_exit_bubble_type.cc', 1431 'browser/ui/fullscreen/fullscreen_exit_bubble_type.cc',
1431 'browser/ui/fullscreen/fullscreen_exit_bubble_type.h', 1432 'browser/ui/fullscreen/fullscreen_exit_bubble_type.h',
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after
2449 'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h', 2450 'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
2450 ], 2451 ],
2451 # Used when Ash is enabled but not ChromeOS. 2452 # Used when Ash is enabled but not ChromeOS.
2452 'chrome_browser_ui_ash_non_chromeos': [ 2453 'chrome_browser_ui_ash_non_chromeos': [
2453 'browser/ui/ash/chrome_shell_delegate_views.cc', 2454 'browser/ui/ash/chrome_shell_delegate_views.cc',
2454 'browser/ui/ash/multi_user/multi_user_context_menu.cc', 2455 'browser/ui/ash/multi_user/multi_user_context_menu.cc',
2455 'browser/ui/ash/multi_user/multi_user_context_menu.h', 2456 'browser/ui/ash/multi_user/multi_user_context_menu.h',
2456 'browser/ui/ash/session_state_delegate_views.cc', 2457 'browser/ui/ash/session_state_delegate_views.cc',
2457 'browser/ui/ash/session_state_delegate_views.h', 2458 'browser/ui/ash/session_state_delegate_views.h',
2458 ], 2459 ],
2460 # Used when not using android and not using Athena.
2461 '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
2462 'browser/ui/extensions/extension_install_ui_factory.cc',
2463 ],
2459 # Used when athena is enabled. 2464 # Used when athena is enabled.
2460 'chrome_browser_ui_athena_sources': [ 2465 'chrome_browser_ui_athena_sources': [
2461 #TODO(mukai): Port AppListService to Athena (crbug.com/417571) 2466 #TODO(mukai): Port AppListService to Athena (crbug.com/417571)
2462 'browser/ui/app_list/app_list_service_disabled.cc', 2467 'browser/ui/app_list/app_list_service_disabled.cc',
2463 2468
2469 'browser/ui/athena/extensions/extension_install_ui_factory_athena.cc',
2464 'browser/ui/views/athena/athena_util.cc', 2470 'browser/ui/views/athena/athena_util.cc',
2465 'browser/ui/views/athena/athena_util.h', 2471 'browser/ui/views/athena/athena_util.h',
2466 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc', 2472 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc',
2467 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h', 2473 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h',
2468 ], 2474 ],
2469 # Counts desktop Linux and ChromeOS. 2475 # Counts desktop Linux and ChromeOS.
2470 'chrome_browser_ui_linux_sources': [ 2476 'chrome_browser_ui_linux_sources': [
2471 'browser/ui/startup/autolaunch_prompt.cc', 2477 'browser/ui/startup/autolaunch_prompt.cc',
2472 'browser/ui/views/apps/chrome_apps_client_views.cc', 2478 'browser/ui/views/apps/chrome_apps_client_views.cc',
2473 'browser/ui/views/frame/taskbar_decorator.cc', 2479 'browser/ui/views/frame/taskbar_decorator.cc',
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
2725 'defines': ['USE_ATHENA=1'], 2731 'defines': ['USE_ATHENA=1'],
2726 'sources': [ '<@(chrome_browser_ui_athena_sources)' ], 2732 'sources': [ '<@(chrome_browser_ui_athena_sources)' ],
2727 'dependencies': [ 2733 'dependencies': [
2728 '<(DEPTH)/athena/athena.gyp:athena_lib', 2734 '<(DEPTH)/athena/athena.gyp:athena_lib',
2729 '<(DEPTH)/athena/athena.gyp:athena_chrome_lib', 2735 '<(DEPTH)/athena/athena.gyp:athena_chrome_lib',
2730 '<(DEPTH)/athena/athena.gyp:athena_content_lib', 2736 '<(DEPTH)/athena/athena.gyp:athena_content_lib',
2731 '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib', 2737 '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib',
2732 ], 2738 ],
2733 }, { # use_athena==0 2739 }, { # use_athena==0
2734 'conditions': [ 2740 'conditions': [
2741 ['OS!="android"', {
2742 'sources': [ '<@(chrome_browser_ui_non_athena_non_android_sources) ' ],
2743 }],
2735 ['use_ash==1', { 2744 ['use_ash==1', {
2736 'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ], 2745 'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ],
2737 }], 2746 }],
2738 ], 2747 ],
2739 }], 2748 }],
2740 ['toolkit_views==1', { 2749 ['toolkit_views==1', {
2741 'sources': [ '<@(chrome_browser_ui_views_sources)' ], 2750 'sources': [ '<@(chrome_browser_ui_views_sources)' ],
2742 'conditions': [ 2751 'conditions': [
2743 ['chromeos == 0 and OS!="mac"', { 2752 ['chromeos == 0 and OS!="mac"', {
2744 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ], 2753 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
3006 }], 3015 }],
3007 ['OS!="android" and OS!="ios"', { 3016 ['OS!="android" and OS!="ios"', {
3008 'dependencies': [ 3017 'dependencies': [
3009 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 3018 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
3010 ], 3019 ],
3011 }], 3020 }],
3012 ], 3021 ],
3013 }, 3022 },
3014 ], 3023 ],
3015 } 3024 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698