summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 23:51:07 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 23:51:07 +0000
commit94c0f60f55440df27d1026c91c22ff85fb9bbce1 (patch)
tree416683907d4fad77a14bf9923b24914118c4be3c
parentce154da766f16bc59390de94726587645c5fed2b (diff)
downloadchromium_src-94c0f60f55440df27d1026c91c22ff85fb9bbce1.zip
chromium_src-94c0f60f55440df27d1026c91c22ff85fb9bbce1.tar.gz
chromium_src-94c0f60f55440df27d1026c91c22ff85fb9bbce1.tar.bz2
[GTK] Add TTS lens graphic to linux TTS box.
BUG=40654 TEST=visual Review URL: http://codereview.chromium.org/1637002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44021 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/location_bar_view_gtk.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc
index c0093bb..5c6ed91 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/gtk/location_bar_view_gtk.cc
@@ -236,11 +236,19 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {
tab_to_search_full_label_, 0, 0);
gtk_fixed_put(GTK_FIXED(tab_to_search_label_fixed),
tab_to_search_partial_label_, 0, 0);
+ GtkWidget* tab_to_search_hbox = gtk_hbox_new(FALSE, 0);
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ GtkWidget* tab_to_search_lens = gtk_image_new_from_pixbuf(
+ rb.GetPixbufNamed(IDR_OMNIBOX_SEARCH));
+ gtk_box_pack_start(GTK_BOX(tab_to_search_hbox), tab_to_search_lens,
+ FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(tab_to_search_hbox), tab_to_search_label_fixed,
+ FALSE, FALSE, 0);
// This creates a box around the keyword text with a border, background color,
// and padding around the text.
tab_to_search_box_ = gtk_util::CreateGtkBorderBin(
- tab_to_search_label_fixed, NULL, 1, 1, 2, 2);
+ tab_to_search_hbox, NULL, 1, 1, 2, 3);
gtk_widget_set_name(tab_to_search_box_, "chrome-tab-to-search-box");
gtk_util::ActAsRoundedWindow(tab_to_search_box_, kBorderColor, kCornerSize,
gtk_util::ROUNDED_ALL, gtk_util::BORDER_ALL);
@@ -277,8 +285,7 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {
tab_to_search_hint_leading_label_ = gtk_label_new(NULL);
gtk_widget_set_sensitive(tab_to_search_hint_leading_label_, FALSE);
tab_to_search_hint_icon_ = gtk_image_new_from_pixbuf(
- ResourceBundle::GetSharedInstance().GetPixbufNamed(
- IDR_LOCATION_BAR_KEYWORD_HINT_TAB));
+ rb.GetPixbufNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB));
tab_to_search_hint_trailing_label_ = gtk_label_new(NULL);
gtk_widget_set_sensitive(tab_to_search_hint_trailing_label_, FALSE);
gtk_box_pack_start(GTK_BOX(tab_to_search_hint_),