Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: chrome/browser/ui/gtk/about_chrome_dialog.cc

Issue 6894037: Add more information to about:version and "About Chromium" dialog (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Replace "a/an" with "the", Put OS_CHROMEOS with OS_LINUX, etc Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/gtk/about_chrome_dialog.h" 5 #include "chrome/browser/ui/gtk/about_chrome_dialog.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 } // namespace 100 } // namespace
101 101
102 void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) { 102 void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) {
103 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 103 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
104 static GdkPixbuf* background = rb.GetPixbufNamed(IDR_ABOUT_BACKGROUND); 104 static GdkPixbuf* background = rb.GetPixbufNamed(IDR_ABOUT_BACKGROUND);
105 chrome::VersionInfo version_info; 105 chrome::VersionInfo version_info;
106 std::string current_version = version_info.Version(); 106 std::string current_version = version_info.Version();
107 #if !defined(GOOGLE_CHROME_BUILD) 107 #if !defined(GOOGLE_CHROME_BUILD)
108 current_version += " ("; 108 current_version += " (";
109 current_version += l10n_util::GetStringUTF8(
110 version_info.IsOfficialBuild() ?
111 IDS_ABOUT_VERSION_OFFICIAL : IDS_ABOUT_VERSION_UNOFFICIAL);
112 current_version += " ";
109 current_version += version_info.LastChange(); 113 current_version += version_info.LastChange();
114 current_version += " ";
115 current_version += version_info.OSType();
110 current_version += ")"; 116 current_version += ")";
111 #endif 117 #endif
112 std::string channel = platform_util::GetVersionStringModifier(); 118 std::string channel = platform_util::GetVersionStringModifier();
113 if (!channel.empty()) 119 if (!channel.empty())
114 current_version += " " + channel; 120 current_version += " " + channel;
115 121
116 // Build the dialog. 122 // Build the dialog.
117 GtkWidget* dialog = gtk_dialog_new_with_buttons( 123 GtkWidget* dialog = gtk_dialog_new_with_buttons(
118 l10n_util::GetStringUTF8(IDS_ABOUT_CHROME_TITLE).c_str(), 124 l10n_util::GetStringUTF8(IDS_ABOUT_CHROME_TITLE).c_str(),
119 parent, 125 parent,
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 gtk_util::kContentAreaBorder, 0, 284 gtk_util::kContentAreaBorder, 0,
279 gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder); 285 gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder);
280 gtk_container_add(GTK_CONTAINER(alignment), vbox); 286 gtk_container_add(GTK_CONTAINER(alignment), vbox);
281 gtk_box_pack_start(GTK_BOX(content_area), alignment, FALSE, FALSE, 0); 287 gtk_box_pack_start(GTK_BOX(content_area), alignment, FALSE, FALSE, 0);
282 288
283 g_signal_connect(dialog, "response", G_CALLBACK(OnResponse), NULL); 289 g_signal_connect(dialog, "response", G_CALLBACK(OnResponse), NULL);
284 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 290 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
285 gtk_widget_show_all(dialog); 291 gtk_widget_show_all(dialog);
286 gtk_widget_grab_focus(close_button); 292 gtk_widget_grab_focus(close_button);
287 } 293 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698