Add Personal Stuff tab page to Options in Linux

chrome/browser/gtk/options/options_window_gtk.cc

 // Copyright (c) 2006-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.
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/options_window.h"
 
 #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"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/installer/util/google_update_settings.h"
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
 #endif
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowGtk
 //
-//  The contents of the Options dialog window.
+// The contents of the Options dialog window.
 
 class OptionsWindowGtk {
  public:
   explicit OptionsWindowGtk(Profile* profile);
   ~OptionsWindowGtk();
 
   // Shows the Tab corresponding to the specified OptionsPage.
   void ShowOptionsPage(OptionsPage page, OptionsGroup highlight_group);
 
  private:
   // This is the callback function for Stats reporting checkbox.
   static void OnLoggingChange(GtkWidget* widget,
                               OptionsWindowGtk* options_window);
 
   static void OnSwitchPage(GtkNotebook* notebook, GtkNotebookPage* page,
                            guint page_num, OptionsWindowGtk* options_window);
 
   static void OnWindowDestroy(GtkWidget* widget, OptionsWindowGtk* window);
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(OptionsWindowGtk);
 };
 
 static OptionsWindowGtk* instance_ = NULL;
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowGtk, public:
 
 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();
   // We don't need to observe changes in this value.
   last_selected_page_.Init(prefs::kOptionsWindowLastTabIndex,
                            g_browser_process->local_state(), NULL);
 
   dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringFUTF8(IDS_OPTIONS_DIALOG_TITLE,
           WideToUTF16(l10n_util::GetString(IDS_PRODUCT_NAME))).c_str(),
@@ skipping 11 matching lines @@
   notebook_ = gtk_notebook_new();
 
   gtk_notebook_append_page(
       GTK_NOTEBOOK(notebook_),
       general_page_.get_page_widget(),
       gtk_label_new(
           l10n_util::GetStringUTF8(IDS_OPTIONS_GENERAL_TAB_LABEL).c_str()));
 
   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()));
 
 #ifdef CHROME_PERSONALIZATION
   if (!Personalization::IsP13NDisabled(profile)) {
     gtk_notebook_append_page(
         GTK_NOTEBOOK(notebook_),
         gtk_label_new("TODO personalization"),
         gtk_label_new(
             l10n_util::GetStringUTF8(IDS_OPTIONS_USER_DATA_TAB_LABEL).c_str()));
@@ skipping 112 matching lines @@
                        OptionsGroup highlight_group,
                        Profile* profile) {
   DCHECK(profile);
   // If there's already an existing options window, activate it and switch to
   // the specified page.
   if (!instance_) {
     instance_ = new OptionsWindowGtk(profile);
   }
   instance_->ShowOptionsPage(page, highlight_group);
 }