Renames DNWA::window_ to content_window_

ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
index ebd3327f5f472c21d0c06b2a42dc9070bc991df9..101cd34d2c33605fd64f541ec48f8ea1f46ec0f4 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
@@ -252,15 +252,14 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
   // Ownership passed to RootWindow on Init.
   DesktopRootWindowHost* desktop_root_window_host_;
 
-  // The content of |root_window_|. WARNING: this may be NULL if deleted out
-  // from under us.
-  aura::Window* window_;
-
-  // Contains the content window defined above. Ensures that ZOrder changes
-  // occurring in the content window hierarchy don't affect the other children
-  // of the root window.
+  // Child of the root, contains |content_window_|.
   aura::Window* content_window_container_;
 
+  // Child of |content_window_container_|. This is the return value from
+  // GetNativeView().
+  // WARNING: this may be NULL, in particular during shutdown it becomes NULL.
+  aura::Window* content_window_;
+
   internal::NativeWidgetDelegate* native_widget_delegate_;
 
   scoped_ptr<aura::client::StackingClient> stacking_client_;