chrome/chrome_browser.gypi - Issue 10828151: chrome: Copy app_list files from views/ to ash/

Unified Diff: chrome/chrome_browser.gypi

Issue 10828151: chrome: Copy app_list files from views/ to ash/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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/views/ash/chrome_shell_delegate.cc ('K') | « chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 01bd086e76dbef27285a291be7c1c1ab0e722abe..9eb5ce593204db33de490bc601e1b6ba63af203e 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -2436,6 +2436,15 @@

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

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

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

+ 'browser/ui/ash/app_list/app_list_view_delegate.cc',

+ 'browser/ui/ash/app_list/app_list_view_delegate.h',

+ 'browser/ui/ash/app_list/apps_model_builder.cc',

+ 'browser/ui/ash/app_list/apps_model_builder.h',

+ 'browser/ui/ash/app_list/chrome_app_list_item.h',

+ 'browser/ui/ash/app_list/extension_app_item.cc',

+ 'browser/ui/ash/app_list/extension_app_item.h',

+ 'browser/ui/ash/app_list/search_builder.cc',

+ 'browser/ui/ash/app_list/search_builder.h',

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

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

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

@@ -2444,6 +2453,8 @@

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

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

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

+ 'browser/ui/ash/extension_utils.cc',

+ 'browser/ui/ash/extension_utils.h',

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

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

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

@@ -3513,15 +3524,6 @@

'browser/ui/views/accessibility/invert_bubble_view.h',

'browser/ui/views/app_menu_button_win.cc',

'browser/ui/views/app_menu_button_win.h',

- 'browser/ui/views/ash/app_list/app_list_view_delegate.cc',

- 'browser/ui/views/ash/app_list/app_list_view_delegate.h',

- 'browser/ui/views/ash/app_list/apps_model_builder.cc',

- 'browser/ui/views/ash/app_list/apps_model_builder.h',

- 'browser/ui/views/ash/app_list/chrome_app_list_item.h',

- 'browser/ui/views/ash/app_list/extension_app_item.cc',

- 'browser/ui/views/ash/app_list/extension_app_item.h',

- 'browser/ui/views/ash/app_list/search_builder.cc',

- 'browser/ui/views/ash/app_list/search_builder.h',

'browser/ui/views/ash/balloon_collection_impl_ash.cc',

'browser/ui/views/ash/balloon_collection_impl_ash.h',

'browser/ui/views/ash/balloon_view_ash.cc',

@@ -3532,8 +3534,6 @@

'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',

'browser/ui/views/ash/chrome_shell_delegate.cc',

'browser/ui/views/ash/chrome_shell_delegate.h',

- 'browser/ui/views/ash/extension_utils.cc',

- 'browser/ui/views/ash/extension_utils.h',

'browser/ui/views/ash/launcher/browser_launcher_item_controller.cc',

'browser/ui/views/ash/launcher/browser_launcher_item_controller.h',

'browser/ui/views/ash/launcher/chrome_launcher_controller.cc',