Rework tree APIs to reflect Google style and more const-correctness....

chrome/browser/ui/views/dropdown_bar_host.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 "chrome/browser/ui/views/dropdown_bar_host.h"
 
 #include <algorithm>
 
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/dropdown_bar_view.h"
@@ skipping 113 matching lines @@
 bool DropdownBarHost::IsVisible() const {
   return is_visible_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DropdownBarHost, views::FocusChangeListener implementation:
 void DropdownBarHost::FocusWillChange(views::View* focused_before,
                                       views::View* focused_now) {
   // First we need to determine if one or both of the views passed in are child
   // views of our view.
-  bool our_view_before = focused_before && view_->IsParentOf(focused_before);
-  bool our_view_now = focused_now && view_->IsParentOf(focused_now);
+  bool our_view_before = focused_before && view_->Contains(focused_before);
+  bool our_view_now = focused_now && view_->Contains(focused_now);
 
   // When both our_view_before and our_view_now are false, it means focus is
   // changing hands elsewhere in the application (and we shouldn't do anything).
   // Similarly, when both are true, focus is changing hands within the dropdown
   // widget (and again, we should not do anything). We therefore only need to
   // look at when we gain initial focus and when we loose it.
   if (!our_view_before && our_view_now) {
     // We are gaining focus from outside the dropdown widget so we must register
     // a handler for Escape.
     RegisterAccelerators();
@@ skipping 164 matching lines @@
   focus_manager_->RegisterAccelerator(escape, this);
   esc_accel_target_registered_ = true;
 }
 
 void DropdownBarHost::UnregisterAccelerators() {
   DCHECK(esc_accel_target_registered_);
   views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false);
   focus_manager_->UnregisterAccelerator(escape, this);
   esc_accel_target_registered_ = false;
 }