| Index: chrome/browser/gtk/location_bar_view_gtk.cc
|
| diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc
|
| index 5f95daa5278f95cc579d2f74f0cc07bc9d46aea7..c17027bffce18bbeb8d6844f137e7b468cf20496 100644
|
| --- a/chrome/browser/gtk/location_bar_view_gtk.cc
|
| +++ b/chrome/browser/gtk/location_bar_view_gtk.cc
|
| @@ -613,6 +613,10 @@ std::wstring LocationBarViewGtk::GetTitle() const {
|
| return UTF16ToWideHack(GetTabContents()->GetTitle());
|
| }
|
|
|
| +bool LocationBarViewGtk::IsKeywordHintVisible() const {
|
| + return GTK_WIDGET_VISIBLE(tab_to_search_hint_);
|
| +}
|
| +
|
| void LocationBarViewGtk::ShowFirstRunBubble(FirstRun::BubbleType bubble_type) {
|
| // We need the browser window to be shown before we can show the bubble, but
|
| // we get called before that's happened.
|
| @@ -1199,12 +1203,10 @@ void LocationBarViewGtk::AdjustChildrenVisibility() {
|
|
|
| // Only one of |tab_to_search_box_| and |tab_to_search_hint_| can be visible
|
| // at the same time.
|
| - if (!show_selected_keyword_ && GTK_WIDGET_VISIBLE(tab_to_search_box_)) {
|
| + if (!show_selected_keyword_ && GTK_WIDGET_VISIBLE(tab_to_search_box_))
|
| gtk_widget_hide(tab_to_search_box_);
|
| - } else if (!show_keyword_hint_ && GTK_WIDGET_VISIBLE(tab_to_search_hint_)) {
|
| + else if (!show_keyword_hint_ && GTK_WIDGET_VISIBLE(tab_to_search_hint_))
|
| gtk_widget_hide(tab_to_search_hint_);
|
| - location_entry_->set_enable_tab_to_search(false);
|
| - }
|
|
|
| if (show_selected_keyword_) {
|
| GtkRequisition box, full_label, partial_label;
|
| @@ -1242,17 +1244,14 @@ void LocationBarViewGtk::AdjustChildrenVisibility() {
|
|
|
| if (icon.width >= entry_box_width_ - kInnerPadding) {
|
| gtk_widget_hide(tab_to_search_hint_);
|
| - location_entry_->set_enable_tab_to_search(false);
|
| } else if (full_width >= available_width) {
|
| gtk_widget_hide(tab_to_search_hint_leading_label_);
|
| gtk_widget_hide(tab_to_search_hint_trailing_label_);
|
| gtk_widget_show(tab_to_search_hint_);
|
| - location_entry_->set_enable_tab_to_search(true);
|
| } else if (full_width < available_width) {
|
| gtk_widget_show(tab_to_search_hint_leading_label_);
|
| gtk_widget_show(tab_to_search_hint_trailing_label_);
|
| gtk_widget_show(tab_to_search_hint_);
|
| - location_entry_->set_enable_tab_to_search(true);
|
| }
|
| }
|
| }
|
|
|