Re-land:

views/view.cc

 // Copyright (c) 2011 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 "views/view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 199 matching lines @@
 
 int View::GetIndexOf(const View* view) const {
   ViewVector::const_iterator it = std::find(children_.begin(), children_.end(),
                                             view);
   return it != children_.end() ? it - children_.begin() : -1;
 }
 
 // TODO(beng): remove
 const Window* View::GetWindow() const {
   const Widget* widget = GetWidget();
-  return widget ? widget->GetWindow() : NULL;
+  return widget ? widget->GetContainingWindow() : NULL;
 }
 
 // TODO(beng): remove
 Window* View::GetWindow() {
   return const_cast<Window*>(const_cast<const View*>(this)->GetWindow());
 }
 
 // TODO(beng): remove
 bool View::ContainsNativeView(gfx::NativeView native_view) const {
   for (int i = 0, count = child_count(); i < count; ++i) {
@@ skipping 1692 matching lines @@
     result.append(GetChildViewAt(i)->PrintViewGraph(false));
 
   if (first)
     result.append("}\n");
 
   return result;
 }
 #endif
 
 }  // namespace views