Commit 4b3dd9b1 authored by derat@chromium.org's avatar derat@chromium.org

aura: Rename OnPropertyChanged to OnWindowPropertyChanged.

This renames aura::WindowObserver's OnPropertyChanged()
method to have the word "window" in its name, as all of the
class's other methods do.

BUG=none
TEST=built it

Review URL: http://codereview.chromium.org/8621003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111066 0039d316-1c4b-4281-b951-d872f2087c98
parent a7e1b45a
...@@ -410,8 +410,8 @@ void Window::SetProperty(const char* name, void* value) { ...@@ -410,8 +410,8 @@ void Window::SetProperty(const char* name, void* value) {
prop_map_[name] = value; prop_map_[name] = value;
else else
prop_map_.erase(name); prop_map_.erase(name);
FOR_EACH_OBSERVER(WindowObserver, observers_, FOR_EACH_OBSERVER(
OnPropertyChanged(this, name, old)); WindowObserver, observers_, OnWindowPropertyChanged(this, name, old));
} }
void Window::SetIntProperty(const char* name, int value) { void Window::SetIntProperty(const char* name, int value) {
......
...@@ -29,7 +29,9 @@ class AURA_EXPORT WindowObserver { ...@@ -29,7 +29,9 @@ class AURA_EXPORT WindowObserver {
// Invoked when SetProperty() or SetIntProperty() is called on |window|. // Invoked when SetProperty() or SetIntProperty() is called on |window|.
// |old| is the old property value. // |old| is the old property value.
virtual void OnPropertyChanged(Window* window, const char* key, void* old) {} virtual void OnWindowPropertyChanged(Window* window,
const char* key,
void* old) {}
// Invoked when SetVisible() is invoked on a window. |visible| is the // Invoked when SetVisible() is invoked on a window. |visible| is the
// value supplied to SetVisible(). If |visible| is true, window->IsVisible() // value supplied to SetVisible(). If |visible| is true, window->IsVisible()
......
...@@ -887,7 +887,7 @@ class WindowObserverTest : public WindowTest, ...@@ -887,7 +887,7 @@ class WindowObserverTest : public WindowTest,
} }
// Return a string representation of the arguments passed in // Return a string representation of the arguments passed in
// OnPropertyChanged callback. // OnWindowPropertyChanged callback.
std::string PropertyChangeInfoAndClear() { std::string PropertyChangeInfoAndClear() {
std::string result( std::string result(
base::StringPrintf("name=%s old=%ld new=%ld", base::StringPrintf("name=%s old=%ld new=%ld",
...@@ -920,9 +920,9 @@ class WindowObserverTest : public WindowTest, ...@@ -920,9 +920,9 @@ class WindowObserverTest : public WindowTest,
destroyed_count_++; destroyed_count_++;
} }
virtual void OnPropertyChanged(Window* window, virtual void OnWindowPropertyChanged(Window* window,
const char* name, const char* name,
void* old) OVERRIDE { void* old) OVERRIDE {
property_name_ = std::string(name); property_name_ = std::string(name);
old_property_value_ = reinterpret_cast<intptr_t>(old); old_property_value_ = reinterpret_cast<intptr_t>(old);
new_property_value_ = reinterpret_cast<intptr_t>(window->GetProperty(name)); new_property_value_ = reinterpret_cast<intptr_t>(window->GetProperty(name));
......
...@@ -57,9 +57,9 @@ void AlwaysOnTopController::OnWillRemoveWindow(aura::Window* child) { ...@@ -57,9 +57,9 @@ void AlwaysOnTopController::OnWillRemoveWindow(aura::Window* child) {
child->RemoveObserver(this); child->RemoveObserver(this);
} }
void AlwaysOnTopController::OnPropertyChanged(aura::Window* window, void AlwaysOnTopController::OnWindowPropertyChanged(aura::Window* window,
const char* name, const char* name,
void* old) { void* old) {
if (name == aura::kAlwaysOnTopKey) { if (name == aura::kAlwaysOnTopKey) {
DCHECK(window->type() == aura::WINDOW_TYPE_NORMAL || DCHECK(window->type() == aura::WINDOW_TYPE_NORMAL ||
window->type() == aura::WINDOW_TYPE_POPUP); window->type() == aura::WINDOW_TYPE_POPUP);
......
...@@ -37,9 +37,9 @@ class AlwaysOnTopController : public aura::WindowObserver { ...@@ -37,9 +37,9 @@ class AlwaysOnTopController : public aura::WindowObserver {
// Overridden from aura::WindowObserver: // Overridden from aura::WindowObserver:
virtual void OnWindowAdded(aura::Window* child) OVERRIDE; virtual void OnWindowAdded(aura::Window* child) OVERRIDE;
virtual void OnWillRemoveWindow(aura::Window* child) OVERRIDE; virtual void OnWillRemoveWindow(aura::Window* child) OVERRIDE;
virtual void OnPropertyChanged(aura::Window* window, virtual void OnWindowPropertyChanged(aura::Window* window,
const char* name, const char* name,
void* old) OVERRIDE; void* old) OVERRIDE;
virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
aura::Window* default_container_; aura::Window* default_container_;
......
...@@ -91,9 +91,9 @@ void ModalContainerLayoutManager::SetChildBounds( ...@@ -91,9 +91,9 @@ void ModalContainerLayoutManager::SetChildBounds(
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// ModalContainerLayoutManager, aura::WindowObserver implementation: // ModalContainerLayoutManager, aura::WindowObserver implementation:
void ModalContainerLayoutManager::OnPropertyChanged(aura::Window* window, void ModalContainerLayoutManager::OnWindowPropertyChanged(aura::Window* window,
const char* key, const char* key,
void* old) { void* old) {
if (key != aura::kModalKey) if (key != aura::kModalKey)
return; return;
......
...@@ -51,9 +51,9 @@ class AURA_SHELL_EXPORT ModalContainerLayoutManager ...@@ -51,9 +51,9 @@ class AURA_SHELL_EXPORT ModalContainerLayoutManager
const gfx::Rect& requested_bounds) OVERRIDE; const gfx::Rect& requested_bounds) OVERRIDE;
// Overridden from aura::WindowObserver: // Overridden from aura::WindowObserver:
virtual void OnPropertyChanged(aura::Window* window, virtual void OnWindowPropertyChanged(aura::Window* window,
const char* key, const char* key,
void* old) OVERRIDE; void* old) OVERRIDE;
// Overridden from ui::LayerAnimationObserver: // Overridden from ui::LayerAnimationObserver:
virtual void OnLayerAnimationEnded( virtual void OnLayerAnimationEnded(
......
...@@ -52,9 +52,9 @@ void ShadowController::OnWindowParentChanged(aura::Window* window, ...@@ -52,9 +52,9 @@ void ShadowController::OnWindowParentChanged(aura::Window* window,
} }
} }
void ShadowController::OnPropertyChanged(aura::Window* window, void ShadowController::OnWindowPropertyChanged(aura::Window* window,
const char* name, const char* name,
void* old) { void* old) {
if (name == aura::kShadowTypeKey) if (name == aura::kShadowTypeKey)
HandlePossibleShadowVisibilityChange(window); HandlePossibleShadowVisibilityChange(window);
} }
......
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
// aura::WindowObserver overrides: // aura::WindowObserver overrides:
virtual void OnWindowParentChanged( virtual void OnWindowParentChanged(
aura::Window* window, aura::Window* parent) OVERRIDE; aura::Window* window, aura::Window* parent) OVERRIDE;
virtual void OnPropertyChanged( virtual void OnWindowPropertyChanged(
aura::Window* window, const char* name, void* old) OVERRIDE; aura::Window* window, const char* name, void* old) OVERRIDE;
virtual void OnWindowVisibilityChanged( virtual void OnWindowVisibilityChanged(
aura::Window* window, bool visible) OVERRIDE; aura::Window* window, bool visible) OVERRIDE;
......
...@@ -22,9 +22,9 @@ ShowStateController::ShowStateController( ...@@ -22,9 +22,9 @@ ShowStateController::ShowStateController(
ShowStateController::~ShowStateController() { ShowStateController::~ShowStateController() {
} }
void ShowStateController::OnPropertyChanged(aura::Window* window, void ShowStateController::OnWindowPropertyChanged(aura::Window* window,
const char* name, const char* name,
void* old) { void* old) {
if (name != aura::kShowStateKey) if (name != aura::kShowStateKey)
return; return;
if (window->GetIntProperty(name) == ui::SHOW_STATE_NORMAL) { if (window->GetIntProperty(name) == ui::SHOW_STATE_NORMAL) {
......
...@@ -27,9 +27,9 @@ public: ...@@ -27,9 +27,9 @@ public:
virtual ~ShowStateController(); virtual ~ShowStateController();
// aura::WindowObserver overrides: // aura::WindowObserver overrides:
virtual void OnPropertyChanged(aura::Window* window, virtual void OnWindowPropertyChanged(aura::Window* window,
const char* name, const char* name,
void* old) OVERRIDE; void* old) OVERRIDE;
private: private:
// |workspace_maanger_| is owned by |WorkspaceController|. // |workspace_maanger_| is owned by |WorkspaceController|.
......
...@@ -51,9 +51,9 @@ void ToplevelLayoutManager::SetChildBounds(aura::Window* child, ...@@ -51,9 +51,9 @@ void ToplevelLayoutManager::SetChildBounds(aura::Window* child,
SetChildBoundsDirect(child, requested_bounds); SetChildBoundsDirect(child, requested_bounds);
} }
void ToplevelLayoutManager::OnPropertyChanged(aura::Window* window, void ToplevelLayoutManager::OnWindowPropertyChanged(aura::Window* window,
const char* name, const char* name,
void* old) { void* old) {
if (name == aura::kShowStateKey) if (name == aura::kShowStateKey)
WindowStateChanged(window); WindowStateChanged(window);
} }
......
...@@ -41,9 +41,9 @@ class AURA_SHELL_EXPORT ToplevelLayoutManager : public aura::LayoutManager, ...@@ -41,9 +41,9 @@ class AURA_SHELL_EXPORT ToplevelLayoutManager : public aura::LayoutManager,
const gfx::Rect& requested_bounds) OVERRIDE; const gfx::Rect& requested_bounds) OVERRIDE;
// WindowObserver overrides: // WindowObserver overrides:
virtual void OnPropertyChanged(aura::Window* window, virtual void OnWindowPropertyChanged(aura::Window* window,
const char* name, const char* name,
void* old) OVERRIDE; void* old) OVERRIDE;
private: private:
typedef std::set<aura::Window*> Windows; typedef std::set<aura::Window*> Windows;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment