summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk/browser_window_gtk.cc
diff options
context:
space:
mode:
authorkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-14 20:50:57 +0000
committerkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-14 20:50:57 +0000
commit9f08198ef26ef44632571c855fece402cc6c9cc8 (patch)
tree1069192af4739a13d62eca4e68ceb67f950726d2 /chrome/browser/ui/gtk/browser_window_gtk.cc
parent01b8a993bb58adac8329ff6b5a6240f716d4096a (diff)
downloadchromium_src-9f08198ef26ef44632571c855fece402cc6c9cc8.zip
chromium_src-9f08198ef26ef44632571c855fece402cc6c9cc8.tar.gz
chromium_src-9f08198ef26ef44632571c855fece402cc6c9cc8.tar.bz2
linux: remove obsolete overlay code in TabContentsContainerGtk
BUG=254670 TEST=nothing. Review URL: https://chromiumcodereview.appspot.com/23077002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc')
-rw-r--r--chrome/browser/ui/gtk/browser_window_gtk.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 06268be..e092ad0 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1521,7 +1521,7 @@ void BrowserWindowGtk::RegisterProfilePrefs(
}
WebContents* BrowserWindowGtk::GetDisplayedTab() {
- return contents_container_->GetVisibleTab();
+ return contents_container_->tab();
}
void BrowserWindowGtk::QueueToolbarRedraw() {
@@ -1927,9 +1927,6 @@ void BrowserWindowGtk::MaybeShowBookmarkBar(bool animate) {
bookmark_bar_->SetPageNavigator(browser_.get());
BookmarkBar::State state = browser_->bookmark_bar_state();
- if (contents_container_->HasOverlay() && state == BookmarkBar::DETACHED)
- state = BookmarkBar::HIDDEN;
-
toolbar_->UpdateForBookmarkBarVisibility(state == BookmarkBar::DETACHED);
PlaceBookmarkBar(state == BookmarkBar::DETACHED);
bookmark_bar_->SetBookmarkBarState(