summaryrefslogtreecommitdiffstats
path: root/ash/focus_cycler.cc
diff options
context:
space:
mode:
authorstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 23:33:58 +0000
committerstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 23:33:58 +0000
commit2a80e1eb3649d275f12ee4e4a766029f85ec55e9 (patch)
treea1683d58f9c634c28189e46c5d103ef71359c9a1 /ash/focus_cycler.cc
parente9a32a508c2110f494fb4051fe6a80327b9de1fa (diff)
downloadchromium_src-2a80e1eb3649d275f12ee4e4a766029f85ec55e9.zip
chromium_src-2a80e1eb3649d275f12ee4e4a766029f85ec55e9.tar.gz
chromium_src-2a80e1eb3649d275f12ee4e4a766029f85ec55e9.tar.bz2
Fix status area widget resizing and other Ash tray cleanup.
Moves common EventFilter code to TrayBubbleView::Host. Fixes web balloon toggle and layout behavior. BUG=none TEST=tests pass and system / notification trays are resized / laid out correctly when web notifications occur (requires --ash-notify) For trivial change to focus_cycler.cc: TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10537162 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/focus_cycler.cc')
-rw-r--r--ash/focus_cycler.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/ash/focus_cycler.cc b/ash/focus_cycler.cc
index d439644..8d34499 100644
--- a/ash/focus_cycler.cc
+++ b/ash/focus_cycler.cc
@@ -5,7 +5,6 @@
#include "ash/focus_cycler.h"
#include "ash/shell.h"
-#include "ash/system/tray/system_tray.h"
#include "ash/wm/window_cycle_controller.h"
#include "ui/aura/client/activation_client.h"
#include "ui/aura/window.h"