diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 03:28:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 03:28:46 +0000 |
| commit | 8cfb672c1560ea3354b0a51fa2efca3de8249beb (patch) | |
| tree | 9e4e4dba8001b6b37a6b2b15070544c26f5008be /ash/wm/app_list_controller.cc | |
| parent | 9bf222b0ada03412fbbb61a5dcf2f6205bb1f0d8 (diff) | |
| download | chromium_src-8cfb672c1560ea3354b0a51fa2efca3de8249beb.zip chromium_src-8cfb672c1560ea3354b0a51fa2efca3de8249beb.tar.gz chromium_src-8cfb672c1560ea3354b0a51fa2efca3de8249beb.tar.bz2 | |
Rework FocusManager as FocusClient.
This allows us to have multiple focus system implementations.
http://crbug.com/162100
R=sky@chromium.org
Review URL: https://codereview.chromium.org/11299219
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
| -rw-r--r-- | ash/wm/app_list_controller.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index 965210d..55807a9 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -14,7 +14,7 @@ #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/aura/focus_manager.h" +#include "ui/aura/client/focus_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/base/events/event.h" @@ -160,7 +160,7 @@ void AppListController::SetView(app_list::AppListView* view) { Shell::GetInstance()->AddPreTargetHandler(this); Launcher::ForWindow(GetWindow())->AddIconObserver(this); widget->GetNativeView()->GetRootWindow()->AddRootWindowObserver(this); - widget->GetNativeView()->GetFocusManager()->AddObserver(this); + aura::client::GetFocusClient(widget->GetNativeView())->AddObserver(this); widget->SetOpacity(0); ScheduleAnimation(); @@ -180,7 +180,7 @@ void AppListController::ResetView() { Shell::GetInstance()->RemovePreTargetHandler(this); Launcher::ForWindow(GetWindow())->RemoveIconObserver(this); widget->GetNativeView()->GetRootWindow()->RemoveRootWindowObserver(this); - widget->GetNativeView()->GetFocusManager()->RemoveObserver(this); + aura::client::GetFocusClient(widget->GetNativeView())->RemoveObserver(this); view_ = NULL; } |