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

Unified Diff: chrome/browser/gtk/options/fonts_languages_window_gtk.cc

Issue 174043: Gtk languages options page part 1: accept-languages configuration. (Closed)
Patch Set: rebase Created 11 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « app/l10n_util.cc ('k') | chrome/browser/gtk/options/languages_page_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/options/fonts_languages_window_gtk.cc
diff --git a/chrome/browser/gtk/options/fonts_languages_window_gtk.cc b/chrome/browser/gtk/options/fonts_languages_window_gtk.cc
index ef3a7cf6b19614a924d69bf86f812e98ae5aadda..af0242e44df97db75c59e9a4f136efbb94e64c15 100644
--- a/chrome/browser/gtk/options/fonts_languages_window_gtk.cc
+++ b/chrome/browser/gtk/options/fonts_languages_window_gtk.cc
@@ -10,6 +10,7 @@
#include "base/message_loop.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/gtk/options/fonts_page_gtk.h"
+#include "chrome/browser/gtk/options/languages_page_gtk.h"
#include "chrome/common/gtk_util.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -43,6 +44,9 @@ class FontsLanguagesWindowGtk {
// The fonts page.
FontsPageGtk fonts_page_;
+ // The languages page.
+ LanguagesPageGtk languages_page_;
+
DISALLOW_COPY_AND_ASSIGN(FontsLanguagesWindowGtk);
};
@@ -56,7 +60,8 @@ FontsLanguagesWindowGtk::FontsLanguagesWindowGtk(Profile* profile)
// the record comes from the original profile, but we explicitly use
// the original profile to avoid potential problems.
: profile_(profile->GetOriginalProfile()),
- fonts_page_(profile_) {
+ fonts_page_(profile_),
+ languages_page_(profile_) {
dialog_ = gtk_dialog_new_with_buttons(
l10n_util::GetStringFUTF8(IDS_FONT_LANGUAGE_SETTING_WINDOWS_TITLE,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)).c_str(),
@@ -87,7 +92,7 @@ FontsLanguagesWindowGtk::FontsLanguagesWindowGtk(Profile* profile)
// Langauges tab.
gtk_notebook_append_page(
GTK_NOTEBOOK(notebook_),
- gtk_label_new("TODO content"),
+ languages_page_.get_page_widget(),
gtk_label_new(
l10n_util::GetStringUTF8(
IDS_FONT_LANGUAGE_SETTING_LANGUAGES_TAB_TITLE).c_str()));
« no previous file with comments | « app/l10n_util.cc ('k') | chrome/browser/gtk/options/languages_page_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698