summaryrefslogtreecommitdiffstats
path: root/ui/aura_shell
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura_shell')
-rw-r--r--ui/aura_shell/always_on_top_controller.cc6
-rw-r--r--ui/aura_shell/always_on_top_controller.h6
-rw-r--r--ui/aura_shell/modal_container_layout_manager.cc6
-rw-r--r--ui/aura_shell/modal_container_layout_manager.h6
-rw-r--r--ui/aura_shell/shadow_controller.cc6
-rw-r--r--ui/aura_shell/shadow_controller.h2
-rw-r--r--ui/aura_shell/show_state_controller.cc6
-rw-r--r--ui/aura_shell/show_state_controller.h6
-rw-r--r--ui/aura_shell/toplevel_layout_manager.cc6
-rw-r--r--ui/aura_shell/toplevel_layout_manager.h6
10 files changed, 28 insertions, 28 deletions
diff --git a/ui/aura_shell/always_on_top_controller.cc b/ui/aura_shell/always_on_top_controller.cc
index 177deb3..5c73488 100644
--- a/ui/aura_shell/always_on_top_controller.cc
+++ b/ui/aura_shell/always_on_top_controller.cc
@@ -57,9 +57,9 @@ void AlwaysOnTopController::OnWillRemoveWindow(aura::Window* child) {
child->RemoveObserver(this);
}
-void AlwaysOnTopController::OnPropertyChanged(aura::Window* window,
- const char* name,
- void* old) {
+void AlwaysOnTopController::OnWindowPropertyChanged(aura::Window* window,
+ const char* name,
+ void* old) {
if (name == aura::kAlwaysOnTopKey) {
DCHECK(window->type() == aura::WINDOW_TYPE_NORMAL ||
window->type() == aura::WINDOW_TYPE_POPUP);
diff --git a/ui/aura_shell/always_on_top_controller.h b/ui/aura_shell/always_on_top_controller.h
index e0690b3..19d1606 100644
--- a/ui/aura_shell/always_on_top_controller.h
+++ b/ui/aura_shell/always_on_top_controller.h
@@ -37,9 +37,9 @@ class AlwaysOnTopController : public aura::WindowObserver {
// Overridden from aura::WindowObserver:
virtual void OnWindowAdded(aura::Window* child) OVERRIDE;
virtual void OnWillRemoveWindow(aura::Window* child) OVERRIDE;
- virtual void OnPropertyChanged(aura::Window* window,
- const char* name,
- void* old) OVERRIDE;
+ virtual void OnWindowPropertyChanged(aura::Window* window,
+ const char* name,
+ void* old) OVERRIDE;
virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
aura::Window* default_container_;
diff --git a/ui/aura_shell/modal_container_layout_manager.cc b/ui/aura_shell/modal_container_layout_manager.cc
index 4a42db2..c16df01 100644
--- a/ui/aura_shell/modal_container_layout_manager.cc
+++ b/ui/aura_shell/modal_container_layout_manager.cc
@@ -91,9 +91,9 @@ void ModalContainerLayoutManager::SetChildBounds(
////////////////////////////////////////////////////////////////////////////////
// ModalContainerLayoutManager, aura::WindowObserver implementation:
-void ModalContainerLayoutManager::OnPropertyChanged(aura::Window* window,
- const char* key,
- void* old) {
+void ModalContainerLayoutManager::OnWindowPropertyChanged(aura::Window* window,
+ const char* key,
+ void* old) {
if (key != aura::kModalKey)
return;
diff --git a/ui/aura_shell/modal_container_layout_manager.h b/ui/aura_shell/modal_container_layout_manager.h
index b359432..a01505c 100644
--- a/ui/aura_shell/modal_container_layout_manager.h
+++ b/ui/aura_shell/modal_container_layout_manager.h
@@ -51,9 +51,9 @@ class AURA_SHELL_EXPORT ModalContainerLayoutManager
const gfx::Rect& requested_bounds) OVERRIDE;
// Overridden from aura::WindowObserver:
- virtual void OnPropertyChanged(aura::Window* window,
- const char* key,
- void* old) OVERRIDE;
+ virtual void OnWindowPropertyChanged(aura::Window* window,
+ const char* key,
+ void* old) OVERRIDE;
// Overridden from ui::LayerAnimationObserver:
virtual void OnLayerAnimationEnded(
diff --git a/ui/aura_shell/shadow_controller.cc b/ui/aura_shell/shadow_controller.cc
index e2f2d80..37f2a7d 100644
--- a/ui/aura_shell/shadow_controller.cc
+++ b/ui/aura_shell/shadow_controller.cc
@@ -52,9 +52,9 @@ void ShadowController::OnWindowParentChanged(aura::Window* window,
}
}
-void ShadowController::OnPropertyChanged(aura::Window* window,
- const char* name,
- void* old) {
+void ShadowController::OnWindowPropertyChanged(aura::Window* window,
+ const char* name,
+ void* old) {
if (name == aura::kShadowTypeKey)
HandlePossibleShadowVisibilityChange(window);
}
diff --git a/ui/aura_shell/shadow_controller.h b/ui/aura_shell/shadow_controller.h
index 19fbfad..d2a79f8 100644
--- a/ui/aura_shell/shadow_controller.h
+++ b/ui/aura_shell/shadow_controller.h
@@ -55,7 +55,7 @@ public:
// aura::WindowObserver overrides:
virtual void OnWindowParentChanged(
aura::Window* window, aura::Window* parent) OVERRIDE;
- virtual void OnPropertyChanged(
+ virtual void OnWindowPropertyChanged(
aura::Window* window, const char* name, void* old) OVERRIDE;
virtual void OnWindowVisibilityChanged(
aura::Window* window, bool visible) OVERRIDE;
diff --git a/ui/aura_shell/show_state_controller.cc b/ui/aura_shell/show_state_controller.cc
index 905a8f5..34b11c0 100644
--- a/ui/aura_shell/show_state_controller.cc
+++ b/ui/aura_shell/show_state_controller.cc
@@ -22,9 +22,9 @@ ShowStateController::ShowStateController(
ShowStateController::~ShowStateController() {
}
-void ShowStateController::OnPropertyChanged(aura::Window* window,
- const char* name,
- void* old) {
+void ShowStateController::OnWindowPropertyChanged(aura::Window* window,
+ const char* name,
+ void* old) {
if (name != aura::kShowStateKey)
return;
if (window->GetIntProperty(name) == ui::SHOW_STATE_NORMAL) {
diff --git a/ui/aura_shell/show_state_controller.h b/ui/aura_shell/show_state_controller.h
index 02087de..880ba5b 100644
--- a/ui/aura_shell/show_state_controller.h
+++ b/ui/aura_shell/show_state_controller.h
@@ -27,9 +27,9 @@ public:
virtual ~ShowStateController();
// aura::WindowObserver overrides:
- virtual void OnPropertyChanged(aura::Window* window,
- const char* name,
- void* old) OVERRIDE;
+ virtual void OnWindowPropertyChanged(aura::Window* window,
+ const char* name,
+ void* old) OVERRIDE;
private:
// |workspace_maanger_| is owned by |WorkspaceController|.
diff --git a/ui/aura_shell/toplevel_layout_manager.cc b/ui/aura_shell/toplevel_layout_manager.cc
index 4a06d14..6c6e715 100644
--- a/ui/aura_shell/toplevel_layout_manager.cc
+++ b/ui/aura_shell/toplevel_layout_manager.cc
@@ -51,9 +51,9 @@ void ToplevelLayoutManager::SetChildBounds(aura::Window* child,
SetChildBoundsDirect(child, requested_bounds);
}
-void ToplevelLayoutManager::OnPropertyChanged(aura::Window* window,
- const char* name,
- void* old) {
+void ToplevelLayoutManager::OnWindowPropertyChanged(aura::Window* window,
+ const char* name,
+ void* old) {
if (name == aura::kShowStateKey)
WindowStateChanged(window);
}
diff --git a/ui/aura_shell/toplevel_layout_manager.h b/ui/aura_shell/toplevel_layout_manager.h
index d8774fe..4c66ce7 100644
--- a/ui/aura_shell/toplevel_layout_manager.h
+++ b/ui/aura_shell/toplevel_layout_manager.h
@@ -41,9 +41,9 @@ class AURA_SHELL_EXPORT ToplevelLayoutManager : public aura::LayoutManager,
const gfx::Rect& requested_bounds) OVERRIDE;
// WindowObserver overrides:
- virtual void OnPropertyChanged(aura::Window* window,
- const char* name,
- void* old) OVERRIDE;
+ virtual void OnWindowPropertyChanged(aura::Window* window,
+ const char* name,
+ void* old) OVERRIDE;
private:
typedef std::set<aura::Window*> Windows;
generated by cgit v1.1 at 2025-02-01 10:37:48 +0000