diff options
| -rw-r--r-- | chrome/app/chromium_strings.grd | 6 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 6 | ||||
| -rw-r--r-- | chrome/app/resources/locale_settings.grd | 6 | ||||
| -rw-r--r-- | chrome/browser/gtk/about_chrome_dialog.cc | 49 |
4 files changed, 8 insertions, 59 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 8529dc9..75fd210 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -196,12 +196,6 @@ be available for now. --> <message name="IDS_TERMS_OF_SERVICE" desc="The Terms of Service link text in the About box. Used in IDS_ABOUT_TERMS_OF_SERVICE."> Not used in Chromium. Placeholder to keep resource maps in synch. </message> - <message name="IDS_ABOUT_FLASH_EULA" desc="The Adobe Flash Player EULA label in the About box."> - Not used in Chromium. Placeholder to keep resource maps in synch. - </message> - <message name="IDS_FLASH_EULA" desc="The (Adobe Flash Player) License Agreement link text in the About box. Used in IDS_ABOUT_FLASH_EULA."> - Not used in Chromium. Placeholder to keep resource maps in synch. - </message> <message name="IDS_ACCNAME_APP" desc="The accessible name for the app menu."> Chromium </message> diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index db11195..35407c8 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -246,12 +246,6 @@ Chrome supports. --> <message name="IDS_TERMS_OF_SERVICE" desc="The Terms of Service link text in the About box. Used in IDS_ABOUT_TERMS_OF_SERVICE."> Terms of Service </message> - <message name="IDS_ABOUT_FLASH_EULA" desc="The Adobe Flash Player EULA label in the About box."> - Adobe Flash Player <ph name="FLASH_EULA_LINK">$1<ex>License Agreement</ex></ph> - </message> - <message name="IDS_FLASH_EULA" desc="The (Adobe Flash Player) License Agreement link text in the About box. Used in IDS_ABOUT_FLASH_EULA."> - License Agreement - </message> <message name="IDS_ACCNAME_APP" desc="The accessible name for the app menu."> Chrome </message> diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index 5b72014..c591457 100644 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -545,12 +545,6 @@ http://www.adobe.com/go/settmgr_storage_en </message> - <!-- The URL for Adobe Flash storage settings. --> - <!-- TODO(viettrungluu): how do these vary? --> - <message name="IDS_FLASH_EULA_URL" use_name_for_id="true"> - http://www.adobe.com/products/eulas/#flash_player - </message> - <!-- The width of the sync setup wizard / login dialog in characters. --> <message name="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS" use_name_for_id="true"> 46 diff --git a/chrome/browser/gtk/about_chrome_dialog.cc b/chrome/browser/gtk/about_chrome_dialog.cc index 83d6e03..712228f 100644 --- a/chrome/browser/gtk/about_chrome_dialog.cc +++ b/chrome/browser/gtk/about_chrome_dialog.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -79,13 +79,6 @@ const char* GetChromiumUrl() { return url.c_str(); } -#if defined(GOOGLE_CHROME_BUILD) -const char* GetFlashEulaUrl() { - static std::string url(l10n_util::GetStringUTF8(IDS_FLASH_EULA_URL)); - return url.c_str(); -} -#endif // GOOGLE_CHROME_BUILD - gboolean OnEventBoxExpose(GtkWidget* event_box, GdkEventExpose* expose, gboolean user_data) { @@ -259,20 +252,19 @@ void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) { // Spacing line. gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(""), FALSE, FALSE, 0); - // Google Terms of Service. - std::vector<size_t> tos_url_offsets; - std::wstring tos_text = l10n_util::GetStringF(IDS_ABOUT_TERMS_OF_SERVICE, + std::vector<size_t> url_offsets; + std::wstring text = l10n_util::GetStringF(IDS_ABOUT_TERMS_OF_SERVICE, std::wstring(), std::wstring(), - &tos_url_offsets); + &url_offsets); GtkWidget* tos_chunk1 = gtk_label_new( - WideToUTF8(tos_text.substr(0, tos_url_offsets[0])).c_str()); + WideToUTF8(text.substr(0, url_offsets[0])).c_str()); gtk_misc_set_alignment(GTK_MISC(tos_chunk1), 0.0, 0.5); GtkWidget* tos_link = gtk_chrome_link_button_new( l10n_util::GetStringUTF8(IDS_TERMS_OF_SERVICE).c_str()); GtkWidget* tos_chunk2 = gtk_label_new( - WideToUTF8(tos_text.substr(tos_url_offsets[0])).c_str()); + WideToUTF8(text.substr(url_offsets[0])).c_str()); gtk_misc_set_alignment(GTK_MISC(tos_chunk2), 0.0, 0.5); GtkWidget* tos_hbox = gtk_hbox_new(FALSE, 0); @@ -281,34 +273,9 @@ void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) { gtk_box_pack_start(GTK_BOX(tos_hbox), tos_chunk2, FALSE, FALSE, 0); g_signal_connect(tos_link, "clicked", G_CALLBACK(OnLinkButtonClick), - const_cast<char*>(chrome::kAboutTermsURL)); + const_cast<char*>(chrome::kAboutTermsURL)); gtk_box_pack_start(GTK_BOX(vbox), tos_hbox, TRUE, TRUE, 0); - - // Adobe Flash Player EULA. - std::vector<size_t> fl_eula_url_offsets; - std::wstring fl_eula_text = l10n_util::GetStringF(IDS_ABOUT_FLASH_EULA, - std::wstring(), - std::wstring(), - &fl_eula_url_offsets); - - GtkWidget* fl_eula_chunk1 = gtk_label_new( - WideToUTF8(fl_eula_text.substr(0, fl_eula_url_offsets[0])).c_str()); - gtk_misc_set_alignment(GTK_MISC(fl_eula_chunk1), 0.0, 0.5); - GtkWidget* fl_eula_link = gtk_chrome_link_button_new( - l10n_util::GetStringUTF8(IDS_FLASH_EULA).c_str()); - GtkWidget* fl_eula_chunk2 = gtk_label_new( - WideToUTF8(fl_eula_text.substr(fl_eula_url_offsets[0])).c_str()); - gtk_misc_set_alignment(GTK_MISC(fl_eula_chunk2), 0.0, 0.5); - - GtkWidget* fl_eula_hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(fl_eula_hbox), fl_eula_chunk1, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(fl_eula_hbox), fl_eula_link, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(fl_eula_hbox), fl_eula_chunk2, FALSE, FALSE, 0); - - g_signal_connect(fl_eula_link, "clicked", G_CALLBACK(OnLinkButtonClick), - const_cast<char*>(GetFlashEulaUrl())); - gtk_box_pack_start(GTK_BOX(vbox), fl_eula_hbox, TRUE, TRUE, 0); -#endif // GOOGLE_CHROME_BUILD +#endif GtkWidget* alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0); gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), |