diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 16:43:15 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 16:43:15 +0000 |
| commit | 4f26826dc91e9aa41f3adbda05f94c44581eddd8 (patch) | |
| tree | f5de5a1b868c8b8d1cfc22c9e44dc77da23ccbae /chrome/browser/gtk/bookmark_manager_gtk.cc | |
| parent | 88efb7ec99239eeecaa17d21f8635be1bce29cca (diff) | |
| download | chromium_src-4f26826dc91e9aa41f3adbda05f94c44581eddd8.zip chromium_src-4f26826dc91e9aa41f3adbda05f94c44581eddd8.tar.gz chromium_src-4f26826dc91e9aa41f3adbda05f94c44581eddd8.tar.bz2 | |
Linux: Add first run search bubble.
Review URL: http://codereview.chromium.org/149501
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_manager_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_manager_gtk.cc | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc index 77a7c6a..dab3508 100644 --- a/chrome/browser/gtk/bookmark_manager_gtk.cc +++ b/chrome/browser/gtk/bookmark_manager_gtk.cc @@ -329,28 +329,12 @@ void BookmarkManagerGtk::InitWidgets() { l10n_util::GetStringUTF8(IDS_BOOKMARK_MANAGER_TITLE).c_str()); // Set the default size of the bookmark manager. - // Windows has code to do this that uses ChromeFont; we could share it but - // since we don't plan to use it elsewhere it's probably not worth the effort. - PangoContext* context = gtk_widget_create_pango_context(window_); - PangoFontMetrics* metrics = - pango_context_get_metrics(context, window_->style->font_desc, - pango_context_get_language(context)); - double chars = 0; - StringToDouble(WideToUTF8(l10n_util::GetString( - IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS)), &chars); - int width = - pango_font_metrics_get_approximate_char_width(metrics) * - static_cast<int>(chars) / PANGO_SCALE; - double lines = 0; - StringToDouble(WideToUTF8(l10n_util::GetString( - IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES)), &lines); - int height = - (pango_font_metrics_get_ascent(metrics) + - pango_font_metrics_get_descent(metrics)) * - static_cast<int>(lines) / PANGO_SCALE; + int width, height; + gtk_util::GetWidgetSizeFromResources(window_, + IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS, + IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES, + &width, &height); gtk_window_set_default_size(GTK_WINDOW(window_), width, height); - pango_font_metrics_unref(metrics); - g_object_unref(context); // Build the organize and tools menus. organize_ = gtk_menu_item_new_with_label( |