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/first_run_dialog.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/first_run_dialog.cc')
| -rw-r--r-- | chrome/browser/gtk/first_run_dialog.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/browser/gtk/first_run_dialog.cc b/chrome/browser/gtk/first_run_dialog.cc index 2646b6f..f7a104f 100644 --- a/chrome/browser/gtk/first_run_dialog.cc +++ b/chrome/browser/gtk/first_run_dialog.cc @@ -13,6 +13,7 @@ #include "chrome/installer/util/google_update_settings.h" #include "grit/generated_resources.h" #include "grit/google_chrome_strings.h" +#include "grit/locale_settings.h" // static bool FirstRunDialog::Show(Profile* profile) { @@ -35,6 +36,12 @@ FirstRunDialog::FirstRunDialog(Profile* profile, int& response) GTK_RESPONSE_REJECT, NULL); gtk_window_set_resizable(GTK_WINDOW(dialog_), FALSE); + int width, height; + gtk_util::GetWidgetSizeFromResources(dialog_, + IDS_FIRSTRUN_DIALOG_WIDTH_CHARS, + IDS_FIRSTRUN_DIALOG_HEIGHT_LINES, + &width, &height); + gtk_window_set_default_size(GTK_WINDOW(dialog_), width, height); g_signal_connect(G_OBJECT(dialog_), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL); @@ -42,8 +49,6 @@ FirstRunDialog::FirstRunDialog(Profile* profile, int& response) gtk_box_set_spacing(GTK_BOX(content_area), 18); GtkWidget* vbox = gtk_vbox_new(FALSE, 12); - // Force a size on the vbox so the labels wrap. - gtk_widget_set_size_request(vbox, 350, -1); #if defined(GOOGLE_CHROME_BUILD) // TODO(port): remove this warning before beta release when we have all the @@ -149,6 +154,10 @@ void FirstRunDialog::OnDialogResponse(GtkWidget* widget, int response) { } } + // Set preference to show first run bubble and welcome page. + FirstRun::SetShowFirstRunBubblePref(); + FirstRun::SetShowWelcomePagePref(); + gtk_widget_destroy(dialog_); MessageLoop::current()->Quit(); } |