summaryrefslogtreecommitdiffstats
path: root/ui/aura/test
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura/test')
-rw-r--r--ui/aura/test/aura_test_helper.cc8
-rw-r--r--ui/aura/test/aura_test_helper.h4
-rw-r--r--ui/aura/test/test_activation_client.cc130
-rw-r--r--ui/aura/test/test_activation_client.h63
4 files changed, 6 insertions, 199 deletions
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
index 6cd9d68..5309514 100644
--- a/ui/aura/test/aura_test_helper.cc
+++ b/ui/aura/test/aura_test_helper.cc
@@ -7,12 +7,12 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/default_activation_client.h"
#include "ui/aura/client/default_capture_client.h"
#include "ui/aura/client/focus_client.h"
#include "ui/aura/env.h"
#include "ui/aura/focus_manager.h"
#include "ui/aura/root_window.h"
-#include "ui/aura/test/test_activation_client.h"
#include "ui/aura/test/test_screen.h"
#include "ui/aura/test/test_stacking_client.h"
#include "ui/base/ime/dummy_input_method.h"
@@ -73,8 +73,8 @@ void AuraTestHelper::SetUp() {
focus_client_.reset(new FocusManager);
client::SetFocusClient(root_window_.get(), focus_client_.get());
stacking_client_.reset(new TestStackingClient(root_window_.get()));
- test_activation_client_.reset(
- new test::TestActivationClient(root_window_.get()));
+ activation_client_.reset(
+ new client::DefaultActivationClient(root_window_.get()));
capture_client_.reset(new client::DefaultCaptureClient(root_window_.get()));
test_input_method_.reset(new ui::DummyInputMethod);
root_window_->SetProperty(
@@ -90,7 +90,7 @@ void AuraTestHelper::TearDown() {
teardown_called_ = true;
test_input_method_.reset();
stacking_client_.reset();
- test_activation_client_.reset();
+ activation_client_.reset();
capture_client_.reset();
focus_client_.reset();
root_window_.reset();
diff --git a/ui/aura/test/aura_test_helper.h b/ui/aura/test/aura_test_helper.h
index 9973dbd..02f9c31 100644
--- a/ui/aura/test/aura_test_helper.h
+++ b/ui/aura/test/aura_test_helper.h
@@ -25,11 +25,11 @@ namespace aura {
class RootWindow;
class TestScreen;
namespace client {
+class DefaultActivationClient;
class DefaultCaptureClient;
class FocusClient;
}
namespace test {
-class TestActivationClient;
class TestStackingClient;
// A helper class owned by tests that does common initialization required for
@@ -61,7 +61,7 @@ class AuraTestHelper {
bool owns_root_window_;
scoped_ptr<RootWindow> root_window_;
scoped_ptr<TestStackingClient> stacking_client_;
- scoped_ptr<TestActivationClient> test_activation_client_;
+ scoped_ptr<client::DefaultActivationClient> activation_client_;
scoped_ptr<client::DefaultCaptureClient> capture_client_;
scoped_ptr<ui::InputMethod> test_input_method_;
scoped_ptr<client::FocusClient> focus_client_;
diff --git a/ui/aura/test/test_activation_client.cc b/ui/aura/test/test_activation_client.cc
deleted file mode 100644
index 14f6b30..0000000
--- a/ui/aura/test/test_activation_client.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/aura/test/test_activation_client.h"
-
-#include "ui/aura/client/activation_change_observer.h"
-#include "ui/aura/client/activation_delegate.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
-
-namespace aura {
-namespace test {
-
-////////////////////////////////////////////////////////////////////////////////
-// TestActivationClient, public:
-
-TestActivationClient::TestActivationClient(RootWindow* root_window)
- : last_active_(NULL) {
- client::SetActivationClient(root_window, this);
-}
-
-TestActivationClient::~TestActivationClient() {
- for (unsigned int i = 0; i < active_windows_.size(); ++i) {
- active_windows_[i]->RemoveObserver(this);
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// TestActivationClient, client::ActivationClient implementation:
-
-void TestActivationClient::AddObserver(
- client::ActivationChangeObserver* observer) {
- observers_.AddObserver(observer);
-}
-
-void TestActivationClient::RemoveObserver(
- client::ActivationChangeObserver* observer) {
- observers_.RemoveObserver(observer);
-}
-
-void TestActivationClient::ActivateWindow(Window* window) {
- Window* last_active = GetActiveWindow();
- if (last_active == window)
- return;
-
- last_active_ = last_active;
- RemoveActiveWindow(window);
- active_windows_.push_back(window);
- window->parent()->StackChildAtTop(window);
- window->AddObserver(this);
-
- FOR_EACH_OBSERVER(client::ActivationChangeObserver,
- observers_,
- OnWindowActivated(window, last_active));
-
- aura::client::ActivationChangeObserver* observer =
- aura::client::GetActivationChangeObserver(last_active);
- if (observer)
- observer->OnWindowActivated(window, last_active);
- observer = aura::client::GetActivationChangeObserver(window);
- if (observer)
- observer->OnWindowActivated(window, last_active);
-}
-
-void TestActivationClient::DeactivateWindow(Window* window) {
- aura::client::ActivationChangeObserver* observer =
- aura::client::GetActivationChangeObserver(window);
- if (observer)
- observer->OnWindowActivated(NULL, window);
- if (last_active_)
- ActivateWindow(last_active_);
-}
-
-Window* TestActivationClient::GetActiveWindow() {
- if (active_windows_.empty())
- return NULL;
- return active_windows_.back();
-}
-
-Window* TestActivationClient::GetActivatableWindow(Window* window) {
- return NULL;
-}
-
-Window* TestActivationClient::GetToplevelWindow(Window* window) {
- return NULL;
-}
-
-bool TestActivationClient::OnWillFocusWindow(Window* window,
- const ui::Event* event) {
- return true;
-}
-
-bool TestActivationClient::CanActivateWindow(Window* window) const {
- return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// TestActivationClient, WindowObserver implementation:
-
-void TestActivationClient::OnWindowDestroyed(Window* window) {
- if (window == last_active_)
- last_active_ = NULL;
-
- if (window == GetActiveWindow()) {
- window->RemoveObserver(this);
- active_windows_.pop_back();
- Window* next_active = GetActiveWindow();
- if (next_active && aura::client::GetActivationChangeObserver(next_active)) {
- aura::client::GetActivationChangeObserver(next_active)->OnWindowActivated(
- next_active, NULL);
- }
- return;
- }
-
- RemoveActiveWindow(window);
-}
-
-void TestActivationClient::RemoveActiveWindow(Window* window) {
- for (unsigned int i = 0; i < active_windows_.size(); ++i) {
- if (active_windows_[i] == window) {
- active_windows_.erase(active_windows_.begin() + i);
- window->RemoveObserver(this);
- return;
- }
- }
-}
-
-} // namespace test
-} // namespace aura
diff --git a/ui/aura/test/test_activation_client.h b/ui/aura/test/test_activation_client.h
deleted file mode 100644
index e5eb397..0000000
--- a/ui/aura/test/test_activation_client.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_
-#define UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_
-
-#include "base/compiler_specific.h"
-#include "base/logging.h"
-#include "ui/aura/client/activation_client.h"
-#include "ui/aura/window_observer.h"
-
-namespace aura {
-class RootWindow;
-namespace client {
-class ActivationChangeObserver;
-}
-
-namespace test {
-
-class TestActivationClient : public client::ActivationClient,
- public WindowObserver {
- public:
- explicit TestActivationClient(RootWindow* root_window);
- virtual ~TestActivationClient();
-
- // Overridden from client::ActivationClient:
- virtual void AddObserver(client::ActivationChangeObserver* observer) OVERRIDE;
- virtual void RemoveObserver(
- client::ActivationChangeObserver* observer) OVERRIDE;
- virtual void ActivateWindow(Window* window) OVERRIDE;
- virtual void DeactivateWindow(Window* window) OVERRIDE;
- virtual Window* GetActiveWindow() OVERRIDE;
- virtual Window* GetActivatableWindow(Window* window) OVERRIDE;
- virtual Window* GetToplevelWindow(Window* window) OVERRIDE;
- virtual bool OnWillFocusWindow(Window* window,
- const ui::Event* event) OVERRIDE;
- virtual bool CanActivateWindow(Window* window) const OVERRIDE;
-
- // Overridden from WindowObserver:
- virtual void OnWindowDestroyed(Window* window) OVERRIDE;
-
- private:
- void RemoveActiveWindow(Window* window);
-
- // This class explicitly does NOT store the active window in a window property
- // to make sure that ActivationChangeObserver is not treated as part of the
- // aura API. Assumptions to that end will cause tests that use this client to
- // fail.
- std::vector<Window*> active_windows_;
-
- // The window which was active before the currently active one.
- Window* last_active_;
-
- ObserverList<client::ActivationChangeObserver> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(TestActivationClient);
-};
-
-} // namespace test
-} // namespace aura
-
-#endif // UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_
generated by cgit v1.1 at 2025-03-09 19:13:31 +0000