Cleanup: remove Details::window. Use GetTarget() when possible

ash/wm/drag_window_resizer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/drag_window_resizer.h"
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 167 matching lines @@
   // exception is window/tab dragging operation. During that operation,
   // |mouse_warp_mode_| should be set to WARP_DRAG so that the user could move a
   // window/tab to another display.
   MouseCursorEventFilter* mouse_cursor_filter =
       Shell::GetInstance()->mouse_cursor_filter();
   mouse_cursor_filter->set_mouse_warp_mode(
       ShouldAllowMouseWarp() ?
       MouseCursorEventFilter::WARP_DRAG : MouseCursorEventFilter::WARP_NONE);
   if (ShouldAllowMouseWarp()) {
     mouse_cursor_filter->ShowSharedEdgeIndicator(
-        details.window->GetRootWindow());
+        details.window()->GetRootWindow());

[varkha, 2014/01/08 23:46:56]

Would GetTarget() be more consistent?

   }
   instance_ = this;
 }
 
 void DragWindowResizer::UpdateDragWindow(const gfx::Rect& bounds,
                                          bool in_original_root) {
   if (details_.window_component != HTCAPTION || !ShouldAllowMouseWarp())
     return;
 
   // It's available. Show a phantom window on the display if needed.
@@ skipping 48 matching lines @@
   // Check that this is a drag move operation from a suitable window.
   if (details_.window_component != HTCAPTION ||
       views::corewm::GetTransientParent(GetTarget()) ||
       (GetTarget()->type() != ui::wm::WINDOW_TYPE_NORMAL &&
        GetTarget()->type() != ui::wm::WINDOW_TYPE_PANEL &&
        GetTarget()->type() != ui::wm::WINDOW_TYPE_POPUP))
     return NULL;
 
   // We only allow to drag the window onto a tray of it's own RootWindow.
   SystemTray* tray = internal::GetRootWindowController(
-      details_.window->GetRootWindow())->GetSystemTray();
+      details_.window()->GetRootWindow())->GetSystemTray();

[varkha, 2014/01/08 23:46:56]

I think GetTarget() here would be more consistent.

 
   // Again - unit tests might not have a tray.
   if (!tray)
     return NULL;
 
   const std::vector<internal::TrayUser*> tray_users = tray->GetTrayUserItems();
   if (tray_users.size() <= 1)
     return NULL;
 
   std::vector<internal::TrayUser*>::const_iterator it = tray_users.begin();
@@ skipping 11 matching lines @@
     return false;
 
   // We have to avoid a brief flash caused by the RevertDrag operation.
   // To do this, we first set the opacity of our target window to 0, so that no
   // matter what the RevertDrag does the window will stay hidden. Then transfer
   // the window to the new owner (which will hide it). RevertDrag will then do
   // it's thing and return the transparency to its original value.
   int old_opacity = GetTarget()->layer()->opacity();
   GetTarget()->layer()->SetOpacity(0);
   GetTarget()->SetBounds(details_.initial_bounds_in_parent);
-  if (!tray_user->TransferWindowToUser(details_.window)) {
+  if (!tray_user->TransferWindowToUser(details_.window())) {

[varkha, 2014/01/08 23:46:56]

Ditto here.

     GetTarget()->layer()->SetOpacity(old_opacity);
     return false;
   }
   RevertDrag();
   return true;
 }
 
 }  // namespace internal
 }  // namespace ash