Variety of tweaks to View API.

chrome/browser/ui/views/frame/browser_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 "chrome/browser/ui/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 425 matching lines @@
     const gfx::Point& point) const {
   // The background image starts tiling horizontally at the window left edge and
   // vertically at the top edge of the horizontal tab strip (or where it would
   // be).  We expect our parent's origin to be the window origin.
   gfx::Point window_point(point.Add(GetMirroredPosition()));
   window_point.Offset(0, -frame_->GetHorizontalTabStripVerticalOffset(false));
   return window_point;
 }
 
 int BrowserView::GetSidebarWidth() const {
-  if (!sidebar_container_ || !sidebar_container_->IsVisible())
+  if (!sidebar_container_ || !sidebar_container_->visible())
     return 0;
   return sidebar_split_->divider_offset();
 }
 
 bool BrowserView::IsTabStripVisible() const {
   return browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP);
 }
 
 bool BrowserView::UseVerticalTabs() const {
   return browser_->tabstrip_model()->delegate()->UseVerticalTabs();
@@ skipping 388 matching lines @@
       compact_location_bar_view_host_->UpdateOnTabChange(
           browser()->active_index(), true);
     compact_location_bar_view_host_->GetCompactLocationBarView()->SetPaneFocus(
         last_focused_view_storage_id_, NULL);
   } else {
     toolbar_->SetPaneFocus(last_focused_view_storage_id_, NULL);
   }
 }
 
 void BrowserView::FocusBookmarksToolbar() {
-  if (active_bookmark_bar_ && bookmark_bar_view_->IsVisible()) {
+  if (active_bookmark_bar_ && bookmark_bar_view_->visible()) {
     SaveFocusedView();
     bookmark_bar_view_->SetPaneFocus(last_focused_view_storage_id_, NULL);
   }
 }
 
 void BrowserView::FocusAppMenu() {
   // Chrome doesn't have a traditional menu bar, but it has a menu button in the
   // main toolbar that plays the same role.  If the user presses a key that
   // would typically focus the menu bar, tell the toolbar to focus the menu
   // button.  If the user presses the key again, return focus to the previous
@@ skipping 20 matching lines @@
   // with NULL to represent the tab contents getting focus. If one of these
   // is currently invisible or has no focusable children it will be
   // automatically skipped.
   std::vector<AccessiblePaneView*> accessible_panes;
   GetAccessiblePanes(&accessible_panes);
   int pane_count = static_cast<int>(accessible_panes.size());
 
   std::vector<views::View*> accessible_views(
       accessible_panes.begin(), accessible_panes.end());
   accessible_views.push_back(GetTabContentsContainerView());
-  if (sidebar_container_ && sidebar_container_->IsVisible())
+  if (sidebar_container_ && sidebar_container_->visible())
     accessible_views.push_back(GetSidebarContainerView());
-  if (devtools_container_->IsVisible())
+  if (devtools_container_->visible())
     accessible_views.push_back(devtools_container_->GetFocusView());
   int count = static_cast<int>(accessible_views.size());
 
   // Figure out which view (if any) currently has the focus.
   views::View* focused_view = GetFocusManager()->GetFocusedView();
   int index = -1;
   if (focused_view) {
     for (int i = 0; i < count; ++i) {
       if (accessible_views[i] == focused_view ||
           accessible_views[i]->Contains(focused_view)) {
@@ skipping 972 matching lines @@
 
   contents_container_ = new TabContentsContainer;
   contents_ = new ContentsContainer(contents_container_);
 
   SkColor bg_color = GetWidget()->GetThemeProvider()->
       GetColor(ThemeService::COLOR_TOOLBAR);
 
   bool sidebar_allowed = SidebarManager::IsSidebarAllowed();
   if (sidebar_allowed) {
     sidebar_container_ = new TabContentsContainer;
-    sidebar_container_->SetID(VIEW_ID_SIDE_BAR_CONTAINER);
+    sidebar_container_->set_id(VIEW_ID_SIDE_BAR_CONTAINER);
     sidebar_container_->SetVisible(false);
 
     sidebar_split_ = new views::SingleSplitView(
         contents_,
         sidebar_container_,
         views::SingleSplitView::HORIZONTAL_SPLIT,
         this);
-    sidebar_split_->SetID(VIEW_ID_SIDE_BAR_SPLIT);
+    sidebar_split_->set_id(VIEW_ID_SIDE_BAR_SPLIT);
     sidebar_split_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_SIDE_BAR));
     sidebar_split_->set_background(
         views::Background::CreateSolidBackground(bg_color));
   }
 
   devtools_container_ = new TabContentsContainer;
-  devtools_container_->SetID(VIEW_ID_DEV_TOOLS_DOCKED);
+  devtools_container_->set_id(VIEW_ID_DEV_TOOLS_DOCKED);
   devtools_container_->SetVisible(false);
 
   views::View* contents_view = contents_;
   if (sidebar_allowed)
     contents_view = sidebar_split_;
 
   contents_split_ = new views::SingleSplitView(
       contents_view,
       devtools_container_,
       views::SingleSplitView::VERTICAL_SPLIT,
       this);
-  contents_split_->SetID(VIEW_ID_CONTENTS_SPLIT);
+  contents_split_->set_id(VIEW_ID_CONTENTS_SPLIT);
   contents_split_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_WEB_CONTENTS));
   contents_split_->set_background(
       views::Background::CreateSolidBackground(bg_color));
   AddChildView(contents_split_);
   set_contents_view(contents_split_);
 
   status_bubble_.reset(new StatusBubbleViews(contents_));
 
 #if defined(OS_WIN)
@@ skipping 12 matching lines @@
     browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get());
   }
 #endif
   // Only create our compact navigation classes if the switch is enabled. Note
   // that we directly check the switch and not the pref as the switch may be on
   // and the pref could be off (currently not selected in the context menu).
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableCompactNavigation)) {
     compact_location_bar_view_host_.reset(new CompactLocationBarViewHost(this));
     compact_navigation_bar_ = new CompactNavigationBar(this);
-    compact_navigation_bar_->SetID(VIEW_ID_COMPACT_NAV_BAR);
+    compact_navigation_bar_->set_id(VIEW_ID_COMPACT_NAV_BAR);
     AddChildView(compact_navigation_bar_);
     compact_navigation_bar_->Init();
     compact_options_bar_ = new CompactOptionsBar(this);
-    compact_options_bar_->SetID(VIEW_ID_COMPACT_OPT_BAR);
+    compact_options_bar_->set_id(VIEW_ID_COMPACT_OPT_BAR);
     AddChildView(compact_options_bar_);
     compact_options_bar_->Init();
   }
 
   // Use an empty view for the spacer since all it does is that it replaces the
   // toolbar area in compact navigation mode.
   compact_spacer_ = new views::View();
-  compact_spacer_->SetID(VIEW_ID_COMPACT_NAV_BAR_SPACER);
+  compact_spacer_->set_id(VIEW_ID_COMPACT_NAV_BAR_SPACER);
   AddChildView(compact_spacer_);
 
   // We're now initialized and ready to process Layout requests.
   ignore_layout_ = false;
 }
 
 void BrowserView::LoadingAnimationCallback() {
   base::TimeTicks now = base::TimeTicks::Now();
   if (!last_animation_time_.is_null()) {
     UMA_HISTOGRAM_TIMES(
@@ skipping 96 matching lines @@
   if (tab_contents) {
     SidebarContainer* client_host = SidebarManager::GetInstance()->
         GetActiveSidebarContainerFor(tab_contents->tab_contents());
     if (client_host)
       sidebar_contents = client_host->sidebar_contents();
   }
 
   bool visible = NULL != sidebar_contents &&
                  browser_->SupportsWindowFeature(Browser::FEATURE_SIDEBAR);
 
-  bool should_show = visible && !sidebar_container_->IsVisible();
-  bool should_hide = !visible && sidebar_container_->IsVisible();
+  bool should_show = visible && !sidebar_container_->visible();
+  bool should_hide = !visible && sidebar_container_->visible();
 
   // Update sidebar content.
   TabContents* old_contents = sidebar_container_->tab_contents();
   sidebar_container_->ChangeTabContents(sidebar_contents);
   SidebarManager::GetInstance()->
       NotifyStateChanges(old_contents, sidebar_contents);
 
   // Update sidebar UI width.
   if (should_show) {
     // Restore split offset.
@@ skipping 28 matching lines @@
 
 void BrowserView::UpdateDevToolsForContents(TabContentsWrapper* wrapper) {
   TabContents* devtools_contents = NULL;
   if (wrapper) {
     TabContentsWrapper* devtools_contents_wrapper =
         DevToolsWindow::GetDevToolsContents(wrapper->tab_contents());
     if (devtools_contents_wrapper)
       devtools_contents = devtools_contents_wrapper->tab_contents();
   }
 
-  bool should_show = devtools_contents && !devtools_container_->IsVisible();
-  bool should_hide = !devtools_contents && devtools_container_->IsVisible();
+  bool should_show = devtools_contents && !devtools_container_->visible();
+  bool should_hide = !devtools_contents && devtools_container_->visible();
 
   devtools_container_->ChangeTabContents(devtools_contents);
 
   if (should_show) {
     if (!devtools_focus_tracker_.get()) {
       // Install devtools focus tracker when dev tools window is shown for the
       // first time.
       devtools_focus_tracker_.reset(
           new views::ExternalFocusTracker(devtools_container_,
                                           GetFocusManager()));
@@ skipping 456 matching lines @@
   view->GetWindow()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }