aura: Rename OnWindowVisisbilityChanged() to OnWindowTargetVisibilityChanged().

Note: This was a TODO for sky@.

R=sky@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10796106

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148952 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 15 insertions, 16 deletions

diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 6d14ad4..6d86c30 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1385,7 +1385,7 @@ void RenderWidgetHostViewAura::OnWindowDestroyed() {
   delete this;
 }
 
-void RenderWidgetHostViewAura::OnWindowVisibilityChanged(bool visible) {
+void RenderWidgetHostViewAura::OnWindowTargetVisibilityChanged(bool visible) {
 }
 
 bool RenderWidgetHostViewAura::HasHitTestMask() const {
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index 1a5fb03..cd5e559 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -174,7 +174,7 @@ class RenderWidgetHostViewAura
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
   virtual void OnWindowDestroying() OVERRIDE;
   virtual void OnWindowDestroyed() OVERRIDE;
-  virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
+  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
   virtual bool HasHitTestMask() const OVERRIDE;
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
 
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 6350c41..787de93 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -563,7 +563,7 @@ void WebContentsViewAura::OnWindowDestroying() {
 void WebContentsViewAura::OnWindowDestroyed() {
 }
 
-void WebContentsViewAura::OnWindowVisibilityChanged(bool visible) {
+void WebContentsViewAura::OnWindowTargetVisibilityChanged(bool visible) {
   if (visible)
     web_contents_->WasShown();
   else
diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h
index 6b59c3d..0aeb5ba 100644
--- a/content/browser/web_contents/web_contents_view_aura.h
+++ b/content/browser/web_contents/web_contents_view_aura.h
@@ -105,7 +105,7 @@ class CONTENT_EXPORT WebContentsViewAura
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
   virtual void OnWindowDestroying() OVERRIDE;
   virtual void OnWindowDestroyed() OVERRIDE;
-  virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
+  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
   virtual bool HasHitTestMask() const OVERRIDE;
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
 
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 8c25f40..6ed8c40 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -73,7 +73,7 @@ class DemoWindowDelegate : public aura::WindowDelegate {
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
   virtual void OnWindowDestroying() OVERRIDE {}
   virtual void OnWindowDestroyed() OVERRIDE {}
-  virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE {}
+  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {}
   virtual bool HasHitTestMask() const OVERRIDE { return false; }
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
 
diff --git a/ui/aura/test/test_window_delegate.cc b/ui/aura/test/test_window_delegate.cc
index 8fc11ed..2ba4f52 100644
--- a/ui/aura/test/test_window_delegate.cc
+++ b/ui/aura/test/test_window_delegate.cc
@@ -88,7 +88,7 @@ void TestWindowDelegate::OnWindowDestroying() {
 void TestWindowDelegate::OnWindowDestroyed() {
 }
 
-void TestWindowDelegate::OnWindowVisibilityChanged(bool visible) {
+void TestWindowDelegate::OnWindowTargetVisibilityChanged(bool visible) {
 }
 
 bool TestWindowDelegate::HasHitTestMask() const {
diff --git a/ui/aura/test/test_window_delegate.h b/ui/aura/test/test_window_delegate.h
index 491bbec..1a10586 100644
--- a/ui/aura/test/test_window_delegate.h
+++ b/ui/aura/test/test_window_delegate.h
@@ -46,7 +46,7 @@ class TestWindowDelegate : public WindowDelegate {
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
   virtual void OnWindowDestroying() OVERRIDE;
   virtual void OnWindowDestroyed() OVERRIDE;
-  virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
+  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
   virtual bool HasHitTestMask() const OVERRIDE;
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
 
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 3035ffa..cfefe94 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -694,7 +694,7 @@ void Window::SetVisible(bool visible) {
   visible_ = visible;
   SchedulePaint();
   if (delegate_)
-    delegate_->OnWindowVisibilityChanged(visible);
+    delegate_->OnWindowTargetVisibilityChanged(visible);
 
   if (parent_ && parent_->layout_manager_.get())
     parent_->layout_manager_->OnChildWindowVisibilityChanged(this, visible);
diff --git a/ui/aura/window_delegate.h b/ui/aura/window_delegate.h
index 778311c..6549bed 100644
--- a/ui/aura/window_delegate.h
+++ b/ui/aura/window_delegate.h
@@ -84,11 +84,10 @@ class AURA_EXPORT WindowDelegate {
   // The delegate can use this as an opportunity to delete itself if necessary.
   virtual void OnWindowDestroyed() = 0;
 
-  // Called when the visibility of a Window changes. See description in
-  // WindowObserver::OnWindowDestroyed() for details.
-  // TODO: this should be renamed to OnWindowTargetVisibilityChanged() to
-  // match when it's sent.
-  virtual void OnWindowVisibilityChanged(bool visible) = 0;
+  // Called when the TargetVisibility() of a Window changes. |visible|
+  // corresponds to the target visibility of the window. See
+  // Window::TargetVisibility() for details.
+  virtual void OnWindowTargetVisibilityChanged(bool visible) = 0;
 
   // Called from Window::HitTest to check if the window has a custom hit test
   // mask. It works similar to the views counterparts. That is, if the function
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index f7d6f45..5eaed60 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -1168,7 +1168,7 @@ class VisibilityWindowDelegate : public TestWindowDelegate {
     hidden_ = 0;
   }
 
-  virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE {
+  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {
     if (visible)
       shown_++;
     else
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 1b2b513..6de58a7 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -855,7 +855,7 @@ void NativeWidgetAura::OnWindowDestroyed() {
     delete this;
 }
 
-void NativeWidgetAura::OnWindowVisibilityChanged(bool visible) {
+void NativeWidgetAura::OnWindowTargetVisibilityChanged(bool visible) {
   delegate_->OnNativeWidgetVisibilityChanged(visible);
 }
 
diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h
index afbc302..6a60174 100644
--- a/ui/views/widget/native_widget_aura.h
+++ b/ui/views/widget/native_widget_aura.h
@@ -147,7 +147,7 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
   virtual void OnWindowDestroying() OVERRIDE;
   virtual void OnWindowDestroyed() OVERRIDE;
-  virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
+  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
   virtual bool HasHitTestMask() const OVERRIDE;
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;