diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 20:17:24 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 20:17:24 +0000 |
| commit | bc86070a59cb7812fe9afd0dde467667fd0ea851 (patch) | |
| tree | 6f2f47549317fdcf24026715fa9166f1f1200475 /ash/wm/app_list_controller.cc | |
| parent | 6cbf3b96ca8ad1f68f6531b14739dddf2caada0f (diff) | |
| download | chromium_src-bc86070a59cb7812fe9afd0dde467667fd0ea851.zip chromium_src-bc86070a59cb7812fe9afd0dde467667fd0ea851.tar.gz chromium_src-bc86070a59cb7812fe9afd0dde467667fd0ea851.tar.bz2 | |
Revert 172624 - Remove a bunch of stuff related to Focus/Activation events.
http://crbug.com/162100
R=sadrul@chromium.org
Review URL: https://codereview.chromium.org/11537019
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/11558027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
| -rw-r--r-- | ash/wm/app_list_controller.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index bcc85e5..d21e19f 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -82,7 +82,8 @@ gfx::Rect OffsetTowardsShelf(const gfx::Rect& rect, views::Widget* widget) { // AppListController, public: AppListController::AppListController() - : pagination_model_(new app_list::PaginationModel), + : FocusChangeShim(Shell::GetInstance()), + pagination_model_(new app_list::PaginationModel), is_visible_(false), view_(NULL), should_snap_back_(false) { |