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 /ui/aura/aura.gyp | |
| 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 'ui/aura/aura.gyp')
| -rw-r--r-- | ui/aura/aura.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index d793ac3..249f05e 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -79,6 +79,8 @@ 'env.cc', 'env.h', 'env_observer.h', + 'focus_manager.cc', + 'focus_manager.h', 'input_state_lookup.cc', 'input_state_lookup.h', 'input_state_lookup_win.cc', @@ -157,8 +159,6 @@ 'test/test_cursor_client.h', 'test/test_event_handler.cc', 'test/test_event_handler.h', - 'test/test_focus_client.cc', - 'test/test_focus_client.h', 'test/test_screen.cc', 'test/test_screen.h', 'test/test_stacking_client.cc', |