diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 07:33:09 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 07:33:09 +0000 |
| commit | b1a2b5456d9a4180fd3fea825e94f51fd1837a21 (patch) | |
| tree | b28aa3a097014d68170645141bfa52962c82a370 /ash/wm/app_list_controller.cc | |
| parent | b1ee469933dbbab4503f0e971edee91ad8ce3a72 (diff) | |
| download | chromium_src-b1a2b5456d9a4180fd3fea825e94f51fd1837a21.zip chromium_src-b1a2b5456d9a4180fd3fea825e94f51fd1837a21.tar.gz chromium_src-b1a2b5456d9a4180fd3fea825e94f51fd1837a21.tar.bz2 | |
Skeleton for app_list on OSX, and refactoring for enable_app_list=1 on OS=="mac".
Moves ui/app_list code specific to toolkit-views to ui/app_list/views.
Update gyp[i], include guards, #includes for moved files.
Seed chrome/browser/ui/cocoa/app_list and ui/app_list/cocoa with a
skeleton Cocoa UI.
BUG=138633
TEST=Mostly build changes. Functionality of AppLauncher on ChromeOS
and Windows should be unchanged.
On OSX, without chrome running, `Chromium.app/Contents/MacOS/Chromium --show-app-list`
should show a borderless gray window for 1 second (note: this is for
testing only -- OSX needs a different approach for IPC).
Review URL: https://chromiumcodereview.appspot.com/11784034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
| -rw-r--r-- | ash/wm/app_list_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index 1d402ce..0063d37 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -12,8 +12,8 @@ #include "ash/wm/property_util.h" #include "ash/wm/shelf_layout_manager.h" #include "ui/app_list/app_list_constants.h" -#include "ui/app_list/app_list_view.h" #include "ui/app_list/pagination_model.h" +#include "ui/app_list/views/app_list_view.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" |