Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: chrome/browser/gtk/browser_window_gtk.cc

Issue 165158: Check the bookmark bar state when updating the title of the page. (Closed)
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/gtk/browser_window_gtk.h" 5 #include "chrome/browser/gtk/browser_window_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 #include <X11/XF86keysym.h> 8 #include <X11/XF86keysym.h>
9 9
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 void BrowserWindowGtk::UpdateTitleBar() { 710 void BrowserWindowGtk::UpdateTitleBar() {
711 #if defined(OS_CHROMEOS) 711 #if defined(OS_CHROMEOS)
712 if (panel_controller_) 712 if (panel_controller_)
713 panel_controller_->UpdateTitleBar(); 713 panel_controller_->UpdateTitleBar();
714 #endif 714 #endif
715 715
716 string16 title = browser_->GetWindowTitleForCurrentTab(); 716 string16 title = browser_->GetWindowTitleForCurrentTab();
717 gtk_window_set_title(window_, UTF16ToUTF8(title).c_str()); 717 gtk_window_set_title(window_, UTF16ToUTF8(title).c_str());
718 if (ShouldShowWindowIcon()) 718 if (ShouldShowWindowIcon())
719 titlebar_->UpdateTitle(); 719 titlebar_->UpdateTitle();
720
721 // We need to update the bookmark bar state if we're navigating away from the
722 // NTP and "always show bookmark bar" is not set. On Windows,
723 // UpdateTitleBar() causes a layout in BrowserView which checks to see if
724 // the bookmarks bar should be shown.
725 MaybeShowBookmarkBar(browser_->GetSelectedTabContents(), false);
720 } 726 }
721 727
722 void BrowserWindowGtk::UpdateDevTools() { 728 void BrowserWindowGtk::UpdateDevTools() {
723 UpdateDevToolsForContents( 729 UpdateDevToolsForContents(
724 browser_->tabstrip_model()->GetSelectedTabContents()); 730 browser_->tabstrip_model()->GetSelectedTabContents());
725 } 731 }
726 732
727 void BrowserWindowGtk::FocusDevTools() { 733 void BrowserWindowGtk::FocusDevTools() {
728 NOTIMPLEMENTED(); 734 NOTIMPLEMENTED();
729 } 735 }
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after
1800 // are taken from the WMs' source code. 1806 // are taken from the WMs' source code.
1801 return (wm_name == "Blackbox" || 1807 return (wm_name == "Blackbox" ||
1802 wm_name == "compiz" || 1808 wm_name == "compiz" ||
1803 wm_name == "e16" || // Enlightenment DR16 1809 wm_name == "e16" || // Enlightenment DR16
1804 wm_name == "Fluxbox" || 1810 wm_name == "Fluxbox" ||
1805 wm_name == "KWin" || 1811 wm_name == "KWin" ||
1806 wm_name == "Metacity" || 1812 wm_name == "Metacity" ||
1807 wm_name == "Openbox" || 1813 wm_name == "Openbox" ||
1808 wm_name == "Xfwm4"); 1814 wm_name == "Xfwm4");
1809 } 1815 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698