summaryrefslogtreecommitdiffstats
path: root/chrome/browser/platform_util_aura.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-12 22:33:07 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-12 22:33:07 +0000
commita9ea2b5334e49a3f36b2bb2581b90f301747dc77 (patch)
tree22d64d958abf32ddc75b66224da7c02c6168ce7e /chrome/browser/platform_util_aura.cc
parent2bfa54889d0c31859bf932759ce93652297ab3ec (diff)
downloadchromium_src-a9ea2b5334e49a3f36b2bb2581b90f301747dc77.zip
chromium_src-a9ea2b5334e49a3f36b2bb2581b90f301747dc77.tar.gz
chromium_src-a9ea2b5334e49a3f36b2bb2581b90f301747dc77.tar.bz2
Revert 114095 - Move the concept of Activation to the Shell.
The Active Window is now stored in a property on the RootWindow. Classes wishing to observe changes to this can implement WindowObserver and attach to the RootWindow to be notified of changes in this property. We provide an ActivationClient interface in Aura for customers to use to set/get the active window, and deactivate a window. This is because setting the active window involves more than just changing the property, there is some additional book-keeping that must be done. The ActivationClient is stored in a property on the RootWindow. We also provide an ActivationDelegate interface in Aura that window owners can use to be notified of changes in activation state, and to specify whether or not a window can be activated. The ActivationDelegate should be stored on the relevant window in a property. I moved a lot of Activation-related functionality out of Aura, including all of the unit tests, now on ActivationController, and the associated WindowDelegate implementations which have now become a single TestActivationDelegate implementation. BUG=none TEST=unit tests Review URL: http://codereview.chromium.org/8894018 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/8926004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/platform_util_aura.cc')
-rw-r--r--chrome/browser/platform_util_aura.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/platform_util_aura.cc b/chrome/browser/platform_util_aura.cc
index 5265f96..7f29fdc 100644
--- a/chrome/browser/platform_util_aura.cc
+++ b/chrome/browser/platform_util_aura.cc
@@ -6,7 +6,6 @@
#include "base/logging.h"
#include "ui/aura/window.h"
-#include "ui/aura_shell/window_util.h"
namespace platform_util {
@@ -19,11 +18,11 @@ gfx::NativeView GetParent(gfx::NativeView view) {
}
bool IsWindowActive(gfx::NativeWindow window) {
- return aura_shell::IsActiveWindow(window);
+ return window->IsActive();
}
void ActivateWindow(gfx::NativeWindow window) {
- aura_shell::ActivateWindow(window);
+ window->Activate();
}
bool IsVisible(gfx::NativeView view) {