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

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

Issue 125105: Add Personal Stuff tab page to Options in Linux (Closed)
Patch Set: fix git nit Created 11 years, 6 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 | « chrome/browser/gtk/options/content_page_gtk.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/options/options_window_gtk.cc
diff --git a/chrome/browser/gtk/options/options_window_gtk.cc b/chrome/browser/gtk/options/options_window_gtk.cc
index 5e99ec76d63aff7b3c769b86f661e81cfbdc9eaf..93c13aa41206c703bff82165cee5ea0cef6a7697 100644
--- a/chrome/browser/gtk/options/options_window_gtk.cc
+++ b/chrome/browser/gtk/options/options_window_gtk.cc
@@ -9,6 +9,7 @@
#include "app/l10n_util.h"
#include "base/message_loop.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/gtk/options/content_page_gtk.h"
#include "chrome/browser/gtk/options/general_page_gtk.h"
#include "chrome/browser/profile.h"
#include "chrome/common/gtk_util.h"
@@ -25,7 +26,7 @@
///////////////////////////////////////////////////////////////////////////////
// OptionsWindowGtk
//
-// The contents of the Options dialog window.
+// The contents of the Options dialog window.
class OptionsWindowGtk {
public:
@@ -48,18 +49,21 @@ class OptionsWindowGtk {
// This function gets called when stats reporting option is changed.
void LoggingChanged(GtkWidget* widget);
- // The options dialog
+ // The options dialog.
GtkWidget *dialog_;
- // The container of the option pages
+ // The container of the option pages.
GtkWidget *notebook_;
// The Profile associated with these options.
Profile* profile_;
- // The options pages
+ // The general page.
GeneralPageGtk general_page_;
+ // The content page.
+ ContentPageGtk content_page_;
+
// The last page the user was on when they opened the Options window.
IntegerPrefMember last_selected_page_;
@@ -75,7 +79,9 @@ OptionsWindowGtk::OptionsWindowGtk(Profile* profile)
// Always show preferences for the original profile. Most state when off
// the record comes from the original profile, but we explicitly use
// the original profile to avoid potential problems.
- : profile_(profile->GetOriginalProfile()), general_page_(profile_) {
+ : profile_(profile->GetOriginalProfile()),
+ general_page_(profile_),
+ content_page_(profile_) {
// The download manager needs to be initialized before the contents of the
// Options Window are created.
profile_->GetDownloadManager();
@@ -107,7 +113,7 @@ OptionsWindowGtk::OptionsWindowGtk(Profile* profile)
gtk_notebook_append_page(
GTK_NOTEBOOK(notebook_),
- gtk_label_new("TODO content"),
+ content_page_.get_page_widget(),
gtk_label_new(
l10n_util::GetStringUTF8(IDS_OPTIONS_CONTENT_TAB_LABEL).c_str()));
« no previous file with comments | « chrome/browser/gtk/options/content_page_gtk.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698