| Index: chrome/browser/ui/views/frame/browser_view.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/frame/browser_view.cc (revision 86083)
|
| +++ chrome/browser/ui/views/frame/browser_view.cc (working copy)
|
| @@ -443,7 +443,7 @@
|
| }
|
|
|
| int BrowserView::GetSidebarWidth() const {
|
| - if (!sidebar_container_ || !sidebar_container_->IsVisible())
|
| + if (!sidebar_container_ || !sidebar_container_->visible())
|
| return 0;
|
| return sidebar_split_->divider_offset();
|
| }
|
| @@ -852,7 +852,7 @@
|
| }
|
|
|
| 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);
|
| }
|
| @@ -893,9 +893,9 @@
|
| 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());
|
|
|
| @@ -1888,7 +1888,7 @@
|
| 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(
|
| @@ -1896,7 +1896,7 @@
|
| 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(
|
| @@ -1904,7 +1904,7 @@
|
| }
|
|
|
| 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_;
|
| @@ -1916,7 +1916,7 @@
|
| 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(
|
| @@ -1949,11 +1949,11 @@
|
| 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();
|
| }
|
| @@ -1961,7 +1961,7 @@
|
| // 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.
|
| @@ -2078,8 +2078,8 @@
|
| 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();
|
| @@ -2128,8 +2128,8 @@
|
| 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);
|
|
|
|
|