diff options
author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 04:11:45 +0000 |
---|---|---|
committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 04:11:45 +0000 |
commit | 0039db9b4f365a4c6b1bbd72b4ca4e2aeb65c354 (patch) | |
tree | 5a50f8caa29ce4038da05b20f18161887c3c8fc3 /ash/ash.gyp | |
parent | eb951d02de207130faca3a648d481108c97a8525 (diff) | |
download | chromium_src-0039db9b4f365a4c6b1bbd72b4ca4e2aeb65c354.zip chromium_src-0039db9b4f365a4c6b1bbd72b4ca4e2aeb65c354.tar.gz chromium_src-0039db9b4f365a4c6b1bbd72b4ca4e2aeb65c354.tar.bz2 |
Move app list from ash to ui.
The goal is to make app list an independent component so that it could be reused in elsewhere.
BUG=none.
TEST=none.
Review URL: https://chromiumcodereview.appspot.com/10388032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash.gyp')
-rw-r--r-- | ash/ash.gyp | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 189cfb8..9b53f00 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -25,6 +25,7 @@ '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/compositor/compositor.gyp:compositor', @@ -49,31 +50,6 @@ 'accelerators/accelerator_table.h', 'accelerators/nested_dispatcher_controller.cc', 'accelerators/nested_dispatcher_controller.h', - 'app_list/app_list.cc', - 'app_list/app_list.h', - 'app_list/app_list_bubble_border.cc', - 'app_list/app_list_bubble_border.h', - 'app_list/app_list_item_model.cc', - 'app_list/app_list_item_model.h', - 'app_list/app_list_item_model_observer.h', - 'app_list/app_list_item_view.cc', - 'app_list/app_list_item_view.h', - 'app_list/app_list_model.cc', - 'app_list/app_list_model.h', - 'app_list/app_list_model_view.cc', - 'app_list/app_list_model_view.h', - 'app_list/app_list_view.cc', - 'app_list/app_list_view.h', - 'app_list/app_list_view_delegate.h', - 'app_list/drop_shadow_label.cc', - 'app_list/drop_shadow_label.h', - 'app_list/icon_cache.cc', - 'app_list/icon_cache.h', - 'app_list/page_switcher.cc', - 'app_list/page_switcher.h', - 'app_list/pagination_model.cc', - 'app_list/pagination_model.h', - 'app_list/pagination_model_observer.h', 'ash_switches.cc', 'ash_switches.h', 'caps_lock_delegate.h', @@ -196,6 +172,8 @@ 'tooltips/tooltip_controller.cc', 'tooltips/tooltip_controller.h', 'volume_control_delegate.h', + 'wm/app_list_controller.cc', + 'wm/app_list_controller.h', 'wm/activation_controller.cc', 'wm/activation_controller.h', 'wm/always_on_top_controller.cc', @@ -361,7 +339,6 @@ 'accelerators/accelerator_filter_unittest.cc', 'accelerators/accelerator_table_unittest.cc', 'accelerators/nested_dispatcher_controller_unittest.cc', - 'app_list/app_list_unittest.cc', 'dip_unittest.cc', 'drag_drop/drag_drop_controller_unittest.cc', 'focus_cycler_unittest.cc', @@ -465,6 +442,7 @@ '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', '../ui/compositor/compositor.gyp:compositor', '../ui/compositor/compositor.gyp:compositor_test_support', |