diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 20:25:21 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 20:25:21 +0000 |
| commit | d9ddff90179610845884d13e8cd7422cabae018f (patch) | |
| tree | 20b7c26476d1091c19d67f632990039a720d2dd8 /ash | |
| parent | 35b035ffdb95d3df0ea5c643b1808ea037f8e872 (diff) | |
| download | chromium_src-d9ddff90179610845884d13e8cd7422cabae018f.zip chromium_src-d9ddff90179610845884d13e8cd7422cabae018f.tar.gz chromium_src-d9ddff90179610845884d13e8cd7422cabae018f.tar.bz2 | |
Revert 229437 "Remove old FocusManager code from Aura."
> Remove old FocusManager code from Aura.
>
> Needed to add a simple TestFocusClient that can be used by tests, which were still using the old FocusManager. This allows us to remove some obsolete methods from FocusClient/RootWindow/etc.
>
> R=sky@chromium.org
> BUG=
>
> Review URL: https://codereview.chromium.org/26116008
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/29693004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 1 | ||||
| -rw-r--r-- | ash/wm/dock/docked_window_layout_manager.cc | 2 | ||||
| -rw-r--r-- | ash/wm/panels/panel_layout_manager.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 6e25c52..7af0a3c 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -83,6 +83,7 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/user_action_client.h" #include "ui/aura/env.h" +#include "ui/aura/focus_manager.h" #include "ui/aura/layout_manager.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index e30a94b..e0a08e3 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -22,7 +22,7 @@ #include "base/command_line.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/client/focus_client.h" +#include "ui/aura/focus_manager.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index cf75c29..2100925 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc @@ -24,7 +24,7 @@ #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/client/focus_client.h" +#include "ui/aura/focus_manager.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/compositor/scoped_layer_animation_settings.h" |