Try and force the font size for the bookmarks bar and some hint

text in the omnibox.

BUG=26354

Review URL: http://codereview.chromium.org/1149002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42292 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/gtk/bookmark_utils_gtk.cc

@@ -124,6 +124,8 @@ void ConfigureButtonForNode(const BookmarkNode* node, BookmarkModel* model,
   std::string label_string = WideToUTF8(node->GetTitle());
   if (!label_string.empty()) {
     GtkWidget* label = gtk_label_new(label_string.c_str());
+    // Until we switch to vector graphics, force the font size.
+    gtk_util::ForceFontSizePixels(label, 13.4);  // 13.4px == 10pt @ 96dpi
 
     // Ellipsize long bookmark names.
     if (node != model->other_node()) {

chrome/browser/gtk/location_bar_view_gtk.cc

@@ -22,6 +22,7 @@
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/content_setting_bubble_model.h"
 #include "chrome/browser/content_setting_image_model.h"
+#include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_accessibility_api_constants.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
@@ -348,6 +349,22 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {
   gtk_box_pack_end(GTK_BOX(hbox_.get()), page_action_hbox_.get(),
                    FALSE, FALSE, 0);
 
+  // Until we switch to vector graphics, force the font size of labels.
+  gtk_util::ForceFontSizePixels(type_to_search_hint_,
+      browser_defaults::kAutocompleteEditFontPixelSize);
+  gtk_util::ForceFontSizePixels(info_label_,
+      browser_defaults::kAutocompleteEditFontPixelSize);
+  gtk_util::ForceFontSizePixels(tab_to_search_full_label_,
+      browser_defaults::kAutocompleteEditFontPixelSize);
+  gtk_util::ForceFontSizePixels(tab_to_search_partial_label_,
+      browser_defaults::kAutocompleteEditFontPixelSize);
+  gtk_util::ForceFontSizePixels(tab_to_search_hint_leading_label_,
+      browser_defaults::kAutocompleteEditFontPixelSize);
+  gtk_util::ForceFontSizePixels(tab_to_search_hint_trailing_label_,
+      browser_defaults::kAutocompleteEditFontPixelSize);
+  gtk_util::ForceFontSizePixels(type_to_search_hint_,
+      browser_defaults::kAutocompleteEditFontPixelSize);
+
   registrar_.Add(this,
                  NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());