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

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 1395 matching lines...) Expand 10 before | Expand all | Expand 10 after
1406 'browser/ui/content_settings/content_setting_bubble_model.h', 1406 'browser/ui/content_settings/content_setting_bubble_model.h',
1407 'browser/ui/content_settings/content_setting_bubble_model_delegate.h', 1407 'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
1408 'browser/ui/content_settings/content_setting_image_model.cc', 1408 'browser/ui/content_settings/content_setting_image_model.cc',
1409 'browser/ui/content_settings/content_setting_image_model.h', 1409 'browser/ui/content_settings/content_setting_image_model.h',
1410 'browser/ui/content_settings/content_setting_media_menu_model.cc', 1410 'browser/ui/content_settings/content_setting_media_menu_model.cc',
1411 'browser/ui/content_settings/content_setting_media_menu_model.h', 1411 'browser/ui/content_settings/content_setting_media_menu_model.h',
1412 'browser/ui/elide_url.cc', 1412 'browser/ui/elide_url.cc',
1413 'browser/ui/elide_url.h', 1413 'browser/ui/elide_url.h',
1414 'browser/ui/extensions/application_launch.cc', 1414 'browser/ui/extensions/application_launch.cc',
1415 'browser/ui/extensions/application_launch.h', 1415 'browser/ui/extensions/application_launch.h',
1416 'browser/ui/extensions/application_launch_hosted_app.h',
1417 'browser/ui/extensions/app_launch_params.cc',
1418 'browser/ui/extensions/app_launch_params.h',
1416 'browser/ui/extensions/extension_install_ui_default.cc', 1419 'browser/ui/extensions/extension_install_ui_default.cc',
1417 'browser/ui/extensions/extension_install_ui_default.h', 1420 'browser/ui/extensions/extension_install_ui_default.h',
1418 'browser/ui/extensions/extension_install_ui_factory.cc', 1421 'browser/ui/extensions/extension_install_ui_factory.cc',
1419 'browser/ui/fast_unload_controller.cc', 1422 'browser/ui/fast_unload_controller.cc',
1420 'browser/ui/fast_unload_controller.h', 1423 'browser/ui/fast_unload_controller.h',
1421 'browser/ui/find_bar/find_bar_controller.cc', 1424 'browser/ui/find_bar/find_bar_controller.cc',
1422 'browser/ui/find_bar/find_bar_controller.h', 1425 'browser/ui/find_bar/find_bar_controller.h',
1423 'browser/ui/fullscreen/fullscreen_controller.cc', 1426 'browser/ui/fullscreen/fullscreen_controller.cc',
1424 'browser/ui/fullscreen/fullscreen_controller.h', 1427 'browser/ui/fullscreen/fullscreen_controller.h',
1425 'browser/ui/fullscreen/fullscreen_exit_bubble.cc', 1428 'browser/ui/fullscreen/fullscreen_exit_bubble.cc',
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
2454 'browser/ui/ash/chrome_shell_delegate_views.cc', 2457 'browser/ui/ash/chrome_shell_delegate_views.cc',
2455 'browser/ui/ash/multi_user/multi_user_context_menu.cc', 2458 'browser/ui/ash/multi_user/multi_user_context_menu.cc',
2456 'browser/ui/ash/multi_user/multi_user_context_menu.h', 2459 'browser/ui/ash/multi_user/multi_user_context_menu.h',
2457 'browser/ui/ash/session_state_delegate_views.cc', 2460 'browser/ui/ash/session_state_delegate_views.cc',
2458 'browser/ui/ash/session_state_delegate_views.h', 2461 'browser/ui/ash/session_state_delegate_views.h',
2459 ], 2462 ],
2460 # Used when athena is enabled. 2463 # Used when athena is enabled.
2461 'chrome_browser_ui_athena_sources': [ 2464 'chrome_browser_ui_athena_sources': [
2462 #TODO(mukai): Port AppListService to Athena (crbug.com/417571) 2465 #TODO(mukai): Port AppListService to Athena (crbug.com/417571)
2463 'browser/ui/app_list/app_list_service_disabled.cc', 2466 'browser/ui/app_list/app_list_service_disabled.cc',
2464 2467 'browser/ui/athena/extensions/application_launch_hosted_app_athena.cc',
2465 'browser/ui/views/athena/athena_util.cc', 2468 'browser/ui/views/athena/athena_util.cc',
2466 'browser/ui/views/athena/athena_util.h', 2469 'browser/ui/views/athena/athena_util.h',
2467 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc', 2470 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc',
2468 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h', 2471 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h',
2469 ], 2472 ],
2473 'chrome_browser_ui_non_athena_non_android_sources': [
2474 'browser/ui/extensions/application_launch_hosted_app.cc',
2475 ],
2470 # Counts desktop Linux and ChromeOS. 2476 # Counts desktop Linux and ChromeOS.
2471 'chrome_browser_ui_linux_sources': [ 2477 'chrome_browser_ui_linux_sources': [
2472 'browser/ui/startup/autolaunch_prompt.cc', 2478 'browser/ui/startup/autolaunch_prompt.cc',
2473 'browser/ui/views/apps/chrome_apps_client_views.cc', 2479 'browser/ui/views/apps/chrome_apps_client_views.cc',
2474 'browser/ui/views/frame/taskbar_decorator.cc', 2480 'browser/ui/views/frame/taskbar_decorator.cc',
2475 'browser/ui/webui/certificate_viewer_ui.cc', 2481 'browser/ui/webui/certificate_viewer_ui.cc',
2476 'browser/ui/webui/certificate_viewer_ui.h', 2482 'browser/ui/webui/certificate_viewer_ui.h',
2477 'browser/ui/webui/certificate_viewer_webui.cc', 2483 'browser/ui/webui/certificate_viewer_webui.cc',
2478 'browser/ui/webui/certificate_viewer_webui.h', 2484 'browser/ui/webui/certificate_viewer_webui.h',
2479 ], 2485 ],
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
2726 'defines': ['USE_ATHENA=1'], 2732 'defines': ['USE_ATHENA=1'],
2727 'sources': [ '<@(chrome_browser_ui_athena_sources)' ], 2733 'sources': [ '<@(chrome_browser_ui_athena_sources)' ],
2728 'dependencies': [ 2734 'dependencies': [
2729 '<(DEPTH)/athena/athena.gyp:athena_lib', 2735 '<(DEPTH)/athena/athena.gyp:athena_lib',
2730 '<(DEPTH)/athena/athena.gyp:athena_chrome_lib', 2736 '<(DEPTH)/athena/athena.gyp:athena_chrome_lib',
2731 '<(DEPTH)/athena/athena.gyp:athena_content_lib', 2737 '<(DEPTH)/athena/athena.gyp:athena_content_lib',
2732 '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib', 2738 '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib',
2733 ], 2739 ],
2734 }, { # use_athena==0 2740 }, { # use_athena==0
2735 'conditions': [ 2741 'conditions': [
2742 ['OS!="android"', {
2743 'sources': [ '<@(chrome_browser_ui_non_athena_non_android_sources) ' ],
2744 }],
2736 ['use_ash==1', { 2745 ['use_ash==1', {
2737 'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ], 2746 'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ],
2738 }], 2747 }],
2739 ], 2748 ],
2740 }], 2749 }],
2741 ['toolkit_views==1', { 2750 ['toolkit_views==1', {
2742 'sources': [ '<@(chrome_browser_ui_views_sources)' ], 2751 'sources': [ '<@(chrome_browser_ui_views_sources)' ],
2743 'conditions': [ 2752 'conditions': [
2744 ['chromeos == 0 and OS!="mac"', { 2753 ['chromeos == 0 and OS!="mac"', {
2745 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ], 2754 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
3007 }], 3016 }],
3008 ['OS!="android" and OS!="ios"', { 3017 ['OS!="android" and OS!="ios"', {
3009 'dependencies': [ 3018 'dependencies': [
3010 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 3019 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
3011 ], 3020 ],
3012 }], 3021 }],
3013 ], 3022 ],
3014 }, 3023 },
3015 ], 3024 ],
3016 } 3025 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698