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

Side by Side 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, 7 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 # There are two sections of sources: 7 # There are two sections of sources:
8 # * "Platform"-based sources (OS, toolkit, etc.) 8 # * "Platform"-based sources (OS, toolkit, etc.)
9 # * Feature/directory-based sources (e.g., history, printing) 9 # * Feature/directory-based sources (e.g., history, printing)
10 10
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 'browser/ui/ash/ash_init.cc', 522 'browser/ui/ash/ash_init.cc',
523 'browser/ui/ash/ash_init.h', 523 'browser/ui/ash/ash_init.h',
524 'browser/ui/ash/ash_util.cc', 524 'browser/ui/ash/ash_util.cc',
525 'browser/ui/ash/ash_util.h', 525 'browser/ui/ash/ash_util.h',
526 'browser/ui/ash/cast_config_delegate_chromeos.cc', 526 'browser/ui/ash/cast_config_delegate_chromeos.cc',
527 'browser/ui/ash/cast_config_delegate_chromeos.h', 527 'browser/ui/ash/cast_config_delegate_chromeos.h',
528 'browser/ui/ash/cast_config_delegate_media_router.cc', 528 'browser/ui/ash/cast_config_delegate_media_router.cc',
529 'browser/ui/ash/cast_config_delegate_media_router.h', 529 'browser/ui/ash/cast_config_delegate_media_router.h',
530 'browser/ui/ash/chrome_keyboard_ui.cc', 530 'browser/ui/ash/chrome_keyboard_ui.cc',
531 'browser/ui/ash/chrome_keyboard_ui.h', 531 'browser/ui/ash/chrome_keyboard_ui.h',
532 'browser/ui/ash/chrome_launcher_prefs.cc',
533 'browser/ui/ash/chrome_launcher_prefs.h',
532 'browser/ui/ash/chrome_new_window_delegate.cc', 534 'browser/ui/ash/chrome_new_window_delegate.cc',
533 'browser/ui/ash/chrome_new_window_delegate.h', 535 'browser/ui/ash/chrome_new_window_delegate.h',
534 'browser/ui/ash/chrome_new_window_delegate_chromeos.cc', 536 'browser/ui/ash/chrome_new_window_delegate_chromeos.cc',
535 'browser/ui/ash/chrome_new_window_delegate_chromeos.h', 537 'browser/ui/ash/chrome_new_window_delegate_chromeos.h',
536 'browser/ui/ash/chrome_screenshot_grabber.cc', 538 'browser/ui/ash/chrome_screenshot_grabber.cc',
537 'browser/ui/ash/chrome_screenshot_grabber.h', 539 'browser/ui/ash/chrome_screenshot_grabber.h',
538 'browser/ui/ash/chrome_shell_content_state.cc', 540 'browser/ui/ash/chrome_shell_content_state.cc',
539 'browser/ui/ash/chrome_shell_content_state.h', 541 'browser/ui/ash/chrome_shell_content_state.h',
540 'browser/ui/ash/chrome_shell_content_state_chromeos.cc', 542 'browser/ui/ash/chrome_shell_content_state_chromeos.cc',
541 'browser/ui/ash/chrome_shell_delegate.cc', 543 'browser/ui/ash/chrome_shell_delegate.cc',
(...skipping 22 matching lines...) Expand all
564 'browser/ui/ash/launcher/chrome_launcher_controller.cc', 566 'browser/ui/ash/launcher/chrome_launcher_controller.cc',
565 'browser/ui/ash/launcher/chrome_launcher_controller.h', 567 'browser/ui/ash/launcher/chrome_launcher_controller.h',
566 'browser/ui/ash/launcher/desktop_shell_launcher_context_menu.cc', 568 'browser/ui/ash/launcher/desktop_shell_launcher_context_menu.cc',
567 'browser/ui/ash/launcher/desktop_shell_launcher_context_menu.h', 569 'browser/ui/ash/launcher/desktop_shell_launcher_context_menu.h',
568 'browser/ui/ash/launcher/extension_app_window_launcher_controller.cc', 570 'browser/ui/ash/launcher/extension_app_window_launcher_controller.cc',
569 'browser/ui/ash/launcher/extension_app_window_launcher_controller.h', 571 'browser/ui/ash/launcher/extension_app_window_launcher_controller.h',
570 'browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc' , 572 'browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc' ,
571 'browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h', 573 'browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h',
572 'browser/ui/ash/launcher/extension_launcher_context_menu.cc', 574 'browser/ui/ash/launcher/extension_launcher_context_menu.cc',
573 'browser/ui/ash/launcher/extension_launcher_context_menu.h', 575 'browser/ui/ash/launcher/extension_launcher_context_menu.h',
574 'browser/ui/ash/launcher/launcher_app_tab_helper.cc',
575 'browser/ui/ash/launcher/launcher_app_tab_helper.h',
576 'browser/ui/ash/launcher/launcher_app_updater.cc', 576 'browser/ui/ash/launcher/launcher_app_updater.cc',
577 'browser/ui/ash/launcher/launcher_app_updater.h', 577 'browser/ui/ash/launcher/launcher_app_updater.h',
578 'browser/ui/ash/launcher/launcher_application_menu_item_model.cc', 578 'browser/ui/ash/launcher/launcher_application_menu_item_model.cc',
579 'browser/ui/ash/launcher/launcher_application_menu_item_model.h', 579 'browser/ui/ash/launcher/launcher_application_menu_item_model.h',
580 'browser/ui/ash/launcher/launcher_context_menu.cc', 580 'browser/ui/ash/launcher/launcher_context_menu.cc',
581 'browser/ui/ash/launcher/launcher_context_menu.h', 581 'browser/ui/ash/launcher/launcher_context_menu.h',
582 'browser/ui/ash/launcher/launcher_controller_helper.cc',
583 'browser/ui/ash/launcher/launcher_controller_helper.h',
582 'browser/ui/ash/launcher/launcher_extension_app_updater.cc', 584 'browser/ui/ash/launcher/launcher_extension_app_updater.cc',
583 'browser/ui/ash/launcher/launcher_extension_app_updater.h', 585 'browser/ui/ash/launcher/launcher_extension_app_updater.h',
584 'browser/ui/ash/launcher/launcher_favicon_loader.cc', 586 'browser/ui/ash/launcher/launcher_favicon_loader.cc',
585 'browser/ui/ash/launcher/launcher_favicon_loader.h', 587 'browser/ui/ash/launcher/launcher_favicon_loader.h',
586 'browser/ui/ash/launcher/launcher_item_controller.cc', 588 'browser/ui/ash/launcher/launcher_item_controller.cc',
587 'browser/ui/ash/launcher/launcher_item_controller.h', 589 'browser/ui/ash/launcher/launcher_item_controller.h',
588 'browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc', 590 'browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc',
589 'browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h', 591 'browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h',
590 'browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc', 592 'browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc',
591 'browser/ui/ash/launcher/multi_profile_browser_status_monitor.h', 593 'browser/ui/ash/launcher/multi_profile_browser_status_monitor.h',
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 'browser/ui/views/frame/web_app_left_header_view_ash.cc', 660 'browser/ui/views/frame/web_app_left_header_view_ash.cc',
659 'browser/ui/views/frame/web_app_left_header_view_ash.h', 661 'browser/ui/views/frame/web_app_left_header_view_ash.h',
660 'browser/ui/views/tabs/window_finder_ash.cc', 662 'browser/ui/views/tabs/window_finder_ash.cc',
661 ], 663 ],
662 # Used when ash is disabled. 664 # Used when ash is disabled.
663 'chrome_browser_ui_non_ash_sources': [ 665 'chrome_browser_ui_non_ash_sources': [
664 'browser/ui/views/touch_uma/touch_uma.cc', 666 'browser/ui/views/touch_uma/touch_uma.cc',
665 ], 667 ],
666 # Cross-platform aura sources. 668 # Cross-platform aura sources.
667 'chrome_browser_ui_aura_sources': [ 669 'chrome_browser_ui_aura_sources': [
668 'browser/ui/ash/chrome_launcher_prefs.cc',
669 'browser/ui/ash/chrome_launcher_prefs.h',
670 'browser/ui/aura/accessibility/automation_manager_aura.cc', 670 'browser/ui/aura/accessibility/automation_manager_aura.cc',
671 'browser/ui/aura/accessibility/automation_manager_aura.h', 671 'browser/ui/aura/accessibility/automation_manager_aura.h',
672 'browser/ui/aura/accessibility/ax_root_obj_wrapper.cc', 672 'browser/ui/aura/accessibility/ax_root_obj_wrapper.cc',
673 'browser/ui/aura/accessibility/ax_root_obj_wrapper.h', 673 'browser/ui/aura/accessibility/ax_root_obj_wrapper.h',
674 'browser/ui/aura/accessibility/ax_tree_source_aura.cc', 674 'browser/ui/aura/accessibility/ax_tree_source_aura.cc',
675 'browser/ui/aura/accessibility/ax_tree_source_aura.h', 675 'browser/ui/aura/accessibility/ax_tree_source_aura.h',
676 'browser/ui/aura/native_window_tracker_aura.cc', 676 'browser/ui/aura/native_window_tracker_aura.cc',
677 'browser/ui/aura/native_window_tracker_aura.h', 677 'browser/ui/aura/native_window_tracker_aura.h',
678 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc', 678 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc',
679 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h', 679 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
(...skipping 2696 matching lines...) Expand 10 before | Expand all | Expand 10 after
3376 ], 3376 ],
3377 'sources': [ 3377 'sources': [
3378 '<@(chrome_browser_ui_non_mobile_sources)', 3378 '<@(chrome_browser_ui_non_mobile_sources)',
3379 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', 3379 '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
3380 ], 3380 ],
3381 }], 3381 }],
3382 ], 3382 ],
3383 }, 3383 },
3384 ], 3384 ],
3385 } 3385 }
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698