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

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 635233008: Make management.launchApp() work for hosted apps on Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@webstore_dialogs_athena
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 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 'browser/ui/content_settings/content_setting_bubble_model.h', 1416 'browser/ui/content_settings/content_setting_bubble_model.h',
1417 'browser/ui/content_settings/content_setting_bubble_model_delegate.h', 1417 'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
1418 'browser/ui/content_settings/content_setting_image_model.cc', 1418 'browser/ui/content_settings/content_setting_image_model.cc',
1419 'browser/ui/content_settings/content_setting_image_model.h', 1419 'browser/ui/content_settings/content_setting_image_model.h',
1420 'browser/ui/content_settings/content_setting_media_menu_model.cc', 1420 'browser/ui/content_settings/content_setting_media_menu_model.cc',
1421 'browser/ui/content_settings/content_setting_media_menu_model.h', 1421 'browser/ui/content_settings/content_setting_media_menu_model.h',
1422 'browser/ui/elide_url.cc', 1422 'browser/ui/elide_url.cc',
1423 'browser/ui/elide_url.h', 1423 'browser/ui/elide_url.h',
1424 'browser/ui/extensions/application_launch.cc', 1424 'browser/ui/extensions/application_launch.cc',
1425 'browser/ui/extensions/application_launch.h', 1425 'browser/ui/extensions/application_launch.h',
1426 'browser/ui/extensions/application_launch_web_app.h',
1427 'browser/ui/extensions/app_launch_params.cc',
1428 'browser/ui/extensions/app_launch_params.h',
1426 'browser/ui/extensions/extension_install_ui_default.cc', 1429 'browser/ui/extensions/extension_install_ui_default.cc',
1427 'browser/ui/extensions/extension_install_ui_default.h', 1430 'browser/ui/extensions/extension_install_ui_default.h',
1428 'browser/ui/fast_unload_controller.cc', 1431 'browser/ui/fast_unload_controller.cc',
1429 'browser/ui/fast_unload_controller.h', 1432 'browser/ui/fast_unload_controller.h',
1430 'browser/ui/find_bar/find_bar_controller.cc', 1433 'browser/ui/find_bar/find_bar_controller.cc',
1431 'browser/ui/find_bar/find_bar_controller.h', 1434 'browser/ui/find_bar/find_bar_controller.h',
1432 'browser/ui/fullscreen/fullscreen_controller.cc', 1435 'browser/ui/fullscreen/fullscreen_controller.cc',
1433 'browser/ui/fullscreen/fullscreen_controller.h', 1436 'browser/ui/fullscreen/fullscreen_controller.h',
1434 'browser/ui/fullscreen/fullscreen_exit_bubble.cc', 1437 'browser/ui/fullscreen/fullscreen_exit_bubble.cc',
1435 'browser/ui/fullscreen/fullscreen_exit_bubble.h', 1438 'browser/ui/fullscreen/fullscreen_exit_bubble.h',
(...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after
2462 'browser/ui/ash/multi_user/multi_user_context_menu.cc', 2465 'browser/ui/ash/multi_user/multi_user_context_menu.cc',
2463 'browser/ui/ash/multi_user/multi_user_context_menu.h', 2466 'browser/ui/ash/multi_user/multi_user_context_menu.h',
2464 'browser/ui/ash/session_state_delegate_views.cc', 2467 'browser/ui/ash/session_state_delegate_views.cc',
2465 'browser/ui/ash/session_state_delegate_views.h', 2468 'browser/ui/ash/session_state_delegate_views.h',
2466 ], 2469 ],
2467 # Used when athena is enabled. 2470 # Used when athena is enabled.
2468 'chrome_browser_ui_athena_sources': [ 2471 'chrome_browser_ui_athena_sources': [
2469 #TODO(mukai): Port AppListService to Athena (crbug.com/417571) 2472 #TODO(mukai): Port AppListService to Athena (crbug.com/417571)
2470 'browser/ui/app_list/app_list_service_disabled.cc', 2473 'browser/ui/app_list/app_list_service_disabled.cc',
2471 2474
2475 'browser/ui/athena/extensions/application_launch_web_app_athena.cc',
2472 'browser/ui/views/athena/athena_util.cc', 2476 'browser/ui/views/athena/athena_util.cc',
2473 'browser/ui/views/athena/athena_util.h', 2477 'browser/ui/views/athena/athena_util.h',
2474 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc', 2478 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc',
2475 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h', 2479 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h',
2476 ], 2480 ],
2481 'chrome_browser_ui_non_athena_non_android_sources': [
2482 'browser/ui/extensions/application_launch_web_app.cc',
2483 ],
2477 # Counts desktop Linux and ChromeOS. 2484 # Counts desktop Linux and ChromeOS.
2478 'chrome_browser_ui_linux_sources': [ 2485 'chrome_browser_ui_linux_sources': [
2479 'browser/ui/startup/autolaunch_prompt.cc', 2486 'browser/ui/startup/autolaunch_prompt.cc',
2480 'browser/ui/views/apps/chrome_apps_client_views.cc', 2487 'browser/ui/views/apps/chrome_apps_client_views.cc',
2481 'browser/ui/views/frame/taskbar_decorator.cc', 2488 'browser/ui/views/frame/taskbar_decorator.cc',
2482 'browser/ui/webui/certificate_viewer_ui.cc', 2489 'browser/ui/webui/certificate_viewer_ui.cc',
2483 'browser/ui/webui/certificate_viewer_ui.h', 2490 'browser/ui/webui/certificate_viewer_ui.h',
2484 'browser/ui/webui/certificate_viewer_webui.cc', 2491 'browser/ui/webui/certificate_viewer_webui.cc',
2485 'browser/ui/webui/certificate_viewer_webui.h', 2492 'browser/ui/webui/certificate_viewer_webui.h',
2486 ], 2493 ],
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
2733 'defines': ['USE_ATHENA=1'], 2740 'defines': ['USE_ATHENA=1'],
2734 'sources': [ '<@(chrome_browser_ui_athena_sources)' ], 2741 'sources': [ '<@(chrome_browser_ui_athena_sources)' ],
2735 'dependencies': [ 2742 'dependencies': [
2736 '<(DEPTH)/athena/athena.gyp:athena_lib', 2743 '<(DEPTH)/athena/athena.gyp:athena_lib',
2737 '<(DEPTH)/athena/athena.gyp:athena_chrome_lib', 2744 '<(DEPTH)/athena/athena.gyp:athena_chrome_lib',
2738 '<(DEPTH)/athena/athena.gyp:athena_content_lib', 2745 '<(DEPTH)/athena/athena.gyp:athena_content_lib',
2739 '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib', 2746 '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib',
2740 ], 2747 ],
2741 }, { # use_athena==0 2748 }, { # use_athena==0
2742 'conditions': [ 2749 'conditions': [
2750 ['OS!="android"', {
2751 'sources': [ '<@(chrome_browser_ui_non_athena_non_android_sources) ' ],
2752 }],
2743 ['use_ash==1', { 2753 ['use_ash==1', {
2744 'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ], 2754 'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ],
2745 }], 2755 }],
2746 ], 2756 ],
2747 }], 2757 }],
2748 ['toolkit_views==1', { 2758 ['toolkit_views==1', {
2749 'sources': [ '<@(chrome_browser_ui_views_sources)' ], 2759 'sources': [ '<@(chrome_browser_ui_views_sources)' ],
2750 'conditions': [ 2760 'conditions': [
2751 ['chromeos == 0 and OS!="mac"', { 2761 ['chromeos == 0 and OS!="mac"', {
2752 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ], 2762 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
3014 }], 3024 }],
3015 ['OS!="android" and OS!="ios"', { 3025 ['OS!="android" and OS!="ios"', {
3016 'dependencies': [ 3026 'dependencies': [
3017 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 3027 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
3018 ], 3028 ],
3019 }], 3029 }],
3020 ], 3030 ],
3021 }, 3031 },
3022 ], 3032 ],
3023 } 3033 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698