summaryrefslogtreecommitdiffstats
path: root/ui/aura
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura')
-rw-r--r--ui/aura/aura.gyp4
-rw-r--r--ui/aura/client/default_activation_client.cc (renamed from ui/aura/test/test_activation_client.cc)42
-rw-r--r--ui/aura/client/default_activation_client.h (renamed from ui/aura/test/test_activation_client.h)26
-rw-r--r--ui/aura/test/aura_test_helper.cc8
-rw-r--r--ui/aura/test/aura_test_helper.h4
5 files changed, 44 insertions, 40 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index af6aa7b..539a115 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -44,6 +44,8 @@
'client/cursor_client.h',
'client/cursor_client_observer.h',
'client/cursor_client_observer.cc',
+ 'client/default_activation_client.cc',
+ 'client/default_activation_client.h',
'client/default_capture_client.cc',
'client/default_capture_client.h',
'client/dispatcher_client.cc',
@@ -143,8 +145,6 @@
'test/aura_test_helper.h',
'test/event_generator.cc',
'test/event_generator.h',
- 'test/test_activation_client.cc',
- 'test/test_activation_client.h',
'test/test_aura_initializer.cc',
'test/test_aura_initializer.h',
'test/test_cursor_client.cc',
diff --git a/ui/aura/test/test_activation_client.cc b/ui/aura/client/default_activation_client.cc
index 14f6b30..84ff282 100644
--- a/ui/aura/test/test_activation_client.cc
+++ b/ui/aura/client/default_activation_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/default_activation_client.h"
#include "ui/aura/client/activation_change_observer.h"
#include "ui/aura/client/activation_delegate.h"
@@ -10,36 +10,36 @@
#include "ui/aura/window.h"
namespace aura {
-namespace test {
+namespace client {
////////////////////////////////////////////////////////////////////////////////
-// TestActivationClient, public:
+// DefaultActivationClient, public:
-TestActivationClient::TestActivationClient(RootWindow* root_window)
+DefaultActivationClient::DefaultActivationClient(RootWindow* root_window)
: last_active_(NULL) {
client::SetActivationClient(root_window, this);
}
-TestActivationClient::~TestActivationClient() {
+DefaultActivationClient::~DefaultActivationClient() {
for (unsigned int i = 0; i < active_windows_.size(); ++i) {
active_windows_[i]->RemoveObserver(this);
}
}
////////////////////////////////////////////////////////////////////////////////
-// TestActivationClient, client::ActivationClient implementation:
+// DefaultActivationClient, client::ActivationClient implementation:
-void TestActivationClient::AddObserver(
+void DefaultActivationClient::AddObserver(
client::ActivationChangeObserver* observer) {
observers_.AddObserver(observer);
}
-void TestActivationClient::RemoveObserver(
+void DefaultActivationClient::RemoveObserver(
client::ActivationChangeObserver* observer) {
observers_.RemoveObserver(observer);
}
-void TestActivationClient::ActivateWindow(Window* window) {
+void DefaultActivationClient::ActivateWindow(Window* window) {
Window* last_active = GetActiveWindow();
if (last_active == window)
return;
@@ -63,7 +63,7 @@ void TestActivationClient::ActivateWindow(Window* window) {
observer->OnWindowActivated(window, last_active);
}
-void TestActivationClient::DeactivateWindow(Window* window) {
+void DefaultActivationClient::DeactivateWindow(Window* window) {
aura::client::ActivationChangeObserver* observer =
aura::client::GetActivationChangeObserver(window);
if (observer)
@@ -72,33 +72,33 @@ void TestActivationClient::DeactivateWindow(Window* window) {
ActivateWindow(last_active_);
}
-Window* TestActivationClient::GetActiveWindow() {
+Window* DefaultActivationClient::GetActiveWindow() {
if (active_windows_.empty())
return NULL;
return active_windows_.back();
}
-Window* TestActivationClient::GetActivatableWindow(Window* window) {
+Window* DefaultActivationClient::GetActivatableWindow(Window* window) {
return NULL;
}
-Window* TestActivationClient::GetToplevelWindow(Window* window) {
+Window* DefaultActivationClient::GetToplevelWindow(Window* window) {
return NULL;
}
-bool TestActivationClient::OnWillFocusWindow(Window* window,
- const ui::Event* event) {
+bool DefaultActivationClient::OnWillFocusWindow(Window* window,
+ const ui::Event* event) {
return true;
}
-bool TestActivationClient::CanActivateWindow(Window* window) const {
+bool DefaultActivationClient::CanActivateWindow(Window* window) const {
return true;
}
////////////////////////////////////////////////////////////////////////////////
-// TestActivationClient, WindowObserver implementation:
+// DefaultActivationClient, WindowObserver implementation:
-void TestActivationClient::OnWindowDestroyed(Window* window) {
+void DefaultActivationClient::OnWindowDestroyed(Window* window) {
if (window == last_active_)
last_active_ = NULL;
@@ -116,7 +116,7 @@ void TestActivationClient::OnWindowDestroyed(Window* window) {
RemoveActiveWindow(window);
}
-void TestActivationClient::RemoveActiveWindow(Window* window) {
+void DefaultActivationClient::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);
@@ -126,5 +126,5 @@ void TestActivationClient::RemoveActiveWindow(Window* window) {
}
}
-} // namespace test
+} // namespace client
} // namespace aura
diff --git a/ui/aura/test/test_activation_client.h b/ui/aura/client/default_activation_client.h
index e5eb397..ebf04aa 100644
--- a/ui/aura/test/test_activation_client.h
+++ b/ui/aura/client/default_activation_client.h
@@ -1,12 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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_
+#ifndef UI_AURA_CLIENT_DEFAULT_ACTIVATION_CLIENT_H_
+#define UI_AURA_CLIENT_DEFAULT_ACTIVATION_CLIENT_H_
#include "base/compiler_specific.h"
#include "base/logging.h"
+#include "ui/aura/aura_export.h"
#include "ui/aura/client/activation_client.h"
#include "ui/aura/window_observer.h"
@@ -16,13 +17,16 @@ namespace client {
class ActivationChangeObserver;
}
-namespace test {
+namespace client {
-class TestActivationClient : public client::ActivationClient,
- public WindowObserver {
+// Simple ActivationClient implementation for use by tests and other targets
+// that just need basic behavior (e.g. activate windows whenever requested,
+// restack windows at the top when they're activated, etc.).
+class AURA_EXPORT DefaultActivationClient : public client::ActivationClient,
+ public WindowObserver {
public:
- explicit TestActivationClient(RootWindow* root_window);
- virtual ~TestActivationClient();
+ explicit DefaultActivationClient(RootWindow* root_window);
+ virtual ~DefaultActivationClient();
// Overridden from client::ActivationClient:
virtual void AddObserver(client::ActivationChangeObserver* observer) OVERRIDE;
@@ -54,10 +58,10 @@ class TestActivationClient : public client::ActivationClient,
ObserverList<client::ActivationChangeObserver> observers_;
- DISALLOW_COPY_AND_ASSIGN(TestActivationClient);
+ DISALLOW_COPY_AND_ASSIGN(DefaultActivationClient);
};
-} // namespace test
+} // namespace client
} // namespace aura
-#endif // UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_
+#endif // UI_AURA_CLIENT_DEFAULT_ACTIVATION_CLIENT_H_
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_;
generated by cgit v1.1 at 2025-03-09 19:11:12 +0000