summaryrefslogtreecommitdiffstats
path: root/ash/shell.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-18 22:07:34 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-18 22:07:34 +0000
commit980969549b2d830274e99d8919d6bb2fa0d82b5e (patch)
treef45d0ba2f57b6c2bbd0dc52417664d0e7ac3d38a /ash/shell.cc
parent145e5a1d4494df83036fa4a6f81fd5bf3adbcf90 (diff)
downloadchromium_src-980969549b2d830274e99d8919d6bb2fa0d82b5e.zip
chromium_src-980969549b2d830274e99d8919d6bb2fa0d82b5e.tar.gz
chromium_src-980969549b2d830274e99d8919d6bb2fa0d82b5e.tar.bz2
Attempt to re-land FocusManager removal from Aura.
content_browsertests ContentWindowReparent test was failing, presumably because a focus notification wasn't being broadcast by the new test focus client. R=sky@chromium.org BUG= Review URL: https://codereview.chromium.org/29883002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
-rw-r--r--ash/shell.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index 7af0a3c..6e25c52 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -83,7 +83,6 @@
#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"