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

13 files changed, 37 insertions, 35 deletions

diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 334605c..70040fa 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -410,8 +410,8 @@ void Window::SetProperty(const char* name, void* value) {
     prop_map_[name] = value;
   else
     prop_map_.erase(name);
-  FOR_EACH_OBSERVER(WindowObserver, observers_,
-                    OnPropertyChanged(this, name, old));
+  FOR_EACH_OBSERVER(
+      WindowObserver, observers_, OnWindowPropertyChanged(this, name, old));
 }
 
 void Window::SetIntProperty(const char* name, int value) {
diff --git a/ui/aura/window_observer.h b/ui/aura/window_observer.h
index 38a47ef..3aa0c14 100644
--- a/ui/aura/window_observer.h
+++ b/ui/aura/window_observer.h
@@ -29,7 +29,9 @@ class AURA_EXPORT WindowObserver {
 
   // Invoked when SetProperty() or SetIntProperty() is called on |window|.
   // |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
   // value supplied to SetVisible(). If |visible| is true, window->IsVisible()
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 2c51f71..fe965a2 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -887,7 +887,7 @@ class WindowObserverTest : public WindowTest,
   }
 
   // Return a string representation of the arguments passed in
-  // OnPropertyChanged callback.
+  // OnWindowPropertyChanged callback.
   std::string PropertyChangeInfoAndClear() {
     std::string result(
         base::StringPrintf("name=%s old=%ld new=%ld",
@@ -920,9 +920,9 @@ class WindowObserverTest : public WindowTest,
     destroyed_count_++;
   }
 
-  virtual void OnPropertyChanged(Window* window,
-                                 const char* name,
-                                 void* old) OVERRIDE {
+  virtual void OnWindowPropertyChanged(Window* window,
+                                       const char* name,
+                                       void* old) OVERRIDE {
     property_name_ = std::string(name);
     old_property_value_ = reinterpret_cast<intptr_t>(old);
     new_property_value_ = reinterpret_cast<intptr_t>(window->GetProperty(name));
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;