Variety of tweaks to View API.

chrome/browser/ui/views/frame/browser_view_layout.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/frame/browser_view_layout.h"
 
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/view_ids.h"
@@ skipping 231 matching lines @@
   tabstrip_ = NULL;
   compact_navigation_bar_ = NULL;
   compact_options_bar_ = NULL;
   compact_spacer_ = NULL;
   browser_view_ = static_cast<BrowserView*>(host);
 }
 
 void BrowserViewLayout::Uninstalled(views::View* host) {}
 
 void BrowserViewLayout::ViewAdded(views::View* host, views::View* view) {
-  switch (view->GetID()) {
+  switch (view->id()) {
     case VIEW_ID_CONTENTS_SPLIT: {
       contents_split_ = static_cast<views::SingleSplitView*>(view);
       // We're installed as the LayoutManager before BrowserView creates the
       // contents, so we have to set contents_container_ here rather than in
       // Installed.
       contents_container_ = browser_view_->contents_;
       break;
     }
     case VIEW_ID_INFO_BAR_CONTAINER:
       infobar_container_ = view;
@@ skipping 16 matching lines @@
     case VIEW_ID_COMPACT_NAV_BAR:
       compact_navigation_bar_ = view;
       break;
     case VIEW_ID_COMPACT_OPT_BAR:
       compact_options_bar_ = view;
       break;
   }
 }
 
 void BrowserViewLayout::ViewRemoved(views::View* host, views::View* view) {
-  switch (view->GetID()) {
+  switch (view->id()) {
     case VIEW_ID_BOOKMARK_BAR:
       active_bookmark_bar_ = NULL;
       break;
   }
 }
 
 void BrowserViewLayout::Layout(views::View* host) {
   vertical_layout_rect_ = browser_view_->GetLocalBounds();
   int top = LayoutTabStripRegion();
   if (browser_view_->IsTabStripVisible() && !browser_view_->UseVerticalTabs()) {
@@ skipping 63 matching lines @@
   // If we are in compact nav mode, we want to reduce the tab strip bounds from
   // both ends enough to lay out the compact navigation and options bars. We
   // check the pointers to see if the mode is available, and then check the pref
   // to see if the mode is enabled (and therefore if the additional bars should
   // be made visible).
   if (compact_navigation_bar_ && compact_options_bar_) {
     compact_navigation_bar_->SetVisible(
         browser_view_->UseCompactNavigationBar());
     compact_options_bar_->SetVisible(browser_view_->UseCompactNavigationBar());
 
-    if (compact_navigation_bar_->IsVisible()) {
+    if (compact_navigation_bar_->visible()) {
       gfx::Rect cnav_bar_bounds;
       gfx::Size cnav_bar_size = compact_navigation_bar_->GetPreferredSize();
       cnav_bar_bounds.set_origin(tabstrip_bounds.origin());
       cnav_bar_bounds.set_size(cnav_bar_size);
       compact_navigation_bar_->SetBoundsRect(cnav_bar_bounds);
 
       // The options bar is flush right of the tab strip region.
       gfx::Rect copt_bar_bounds;
       gfx::Size copt_bar_size = compact_options_bar_->GetPreferredSize();
       copt_bar_bounds.set_x(std::max(0, tabstrip_bounds.right() -
@@ skipping 16 matching lines @@
 
   tabstrip_->SetVisible(true);
   tabstrip_->SetBoundsRect(tabstrip_bounds);
   return browser_view_->UseVerticalTabs() ?
       tabstrip_bounds.y() : tabstrip_bounds.bottom();
 }
 
 int BrowserViewLayout::LayoutToolbar(int top) {
   int browser_view_width = vertical_layout_rect_.width();
   bool toolbar_visible = browser_view_->IsToolbarVisible();
-  toolbar_->location_bar()->SetFocusable(toolbar_visible);
+  // TODO(beng): This should not be needed. Focusability should include
+  //             visibility.
+  toolbar_->location_bar()->set_focusable(toolbar_visible);
   int y = top;
   if (!browser_view_->UseVerticalTabs()) {
     y -= ((toolbar_visible || browser_view_->UseCompactNavigationBar()) &&
            browser_view_->IsTabStripVisible()) ?
            kToolbarTabStripVerticalOverlap : 0;
   }
   int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
   toolbar_->SetVisible(toolbar_visible);
   toolbar_->SetBounds(vertical_layout_rect_.x(), y, browser_view_width, height);
 
@@ skipping 169 matching lines @@
     sidebar_split->SetBoundsRect(sidebar_split_bounds);
 }
 
 int BrowserViewLayout::GetTopMarginForActiveContent() {
   if (!active_bookmark_bar_ || !browser_view_->IsBookmarkBarVisible() ||
       !active_bookmark_bar_->IsDetached()) {
     return 0;
   }
 
   if (contents_split_->GetChildViewAt(1) &&
-      contents_split_->GetChildViewAt(1)->IsVisible())
+      contents_split_->GetChildViewAt(1)->visible())
     return 0;
 
   if (SidebarManager::IsSidebarAllowed()) {
     views::View* sidebar_split = contents_split_->GetChildViewAt(0);
     if (sidebar_split->GetChildViewAt(1) &&
-        sidebar_split->GetChildViewAt(1)->IsVisible())
+        sidebar_split->GetChildViewAt(1)->visible())
       return 0;
   }
 
   // Adjust for separator.
   return active_bookmark_bar_->height() -
       views::NonClientFrameView::kClientEdgeThickness;
 }
 
 int BrowserViewLayout::LayoutDownloadShelf(int bottom) {
   // Re-layout the shelf either if it is visible or if it's close animation
@@ skipping 11 matching lines @@
     bottom -= height;
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container_->GetPreferredSize().height() != 0);
 }