UserData Options tab

Plumbing for User Data tab in Options dialog.


Review URL: http://codereview.chromium.org/13150

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6442 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 44 insertions, 3 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 33e8fd4..3c9a45f 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2572,6 +2572,9 @@ each locale. -->
       <message name="IDS_OPTIONS_CONTENT_TAB_LABEL" desc="The title of the Tweaks tab">
         Minor Tweaks
       </message>
+      <message name="IDS_OPTIONS_USER_DATA_TAB_LABEL" desc="The title of the User Data tab">
+        User Data
+      </message>
       <message name="IDS_OPTIONS_ADVANCED_TAB_LABEL" desc="The title of the Advanced tab">
         Under the Hood
       </message>
@@ -2759,6 +2762,27 @@ each locale. -->
         Allow all content to load
       </message>
 
+      <message name="IDS_OPTIONS_IMPORT_DATA_GROUP_NAME" desc="The title of the 'Import' group.">
+        Import:
+      </message>
+      <message name="IDS_OPTIONS_IMPORT_DATA_INFO" desc="Information text about import options.">
+        You can import your bookmarks and settings from other browsers and user accounts on this computer.
+      </message>
+      <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="Label for the import data button.">
+        Import data...
+      </message>
+
+      <message name="IDS_OPTIONS_CLEAR_DATA_GROUP_NAME" desc="The title of the 'Clear data' group.">
+        Clear Data:
+      </message>
+      <message name="IDS_OPTIONS_CLEAR_DATA_INFO" desc="Information text about clear data options.">
+        Clear your browsing data from this computer. Be aware that this may adversely affect the contents of the New Tab Page.
+      </message>
+      <message name="IDS_OPTIONS_CLEAR_DATA_BUTTON" desc="Label for the Clear data button.">
+        Clear browsing data...
+      </message>
+
+
       <!-- Misc advanced option description strings. -->
       <message name="IDS_WEBKIT_JAVA_ENABLED_DESCRIPTION" desc="In the advanced options tab, the text next to the checkbox that enables Java.">
         Enable Java
diff --git a/chrome/browser/options_window.h b/chrome/browser/options_window.h
index 124929b..95dd8ef 100644
--- a/chrome/browser/options_window.h
+++ b/chrome/browser/options_window.h
@@ -15,6 +15,9 @@ enum OptionsPage {
   OPTIONS_PAGE_DEFAULT = -1,
   OPTIONS_PAGE_GENERAL,
   OPTIONS_PAGE_CONTENT,
+#ifdef CHROME_PERSONALIZATION
+  OPTIONS_PAGE_USER_DATA,
+#endif
   OPTIONS_PAGE_ADVANCED,
   OPTIONS_PAGE_COUNT
 };
diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc
index cb4e05b..5b23707 100644
--- a/chrome/browser/views/options/options_window_view.cc
+++ b/chrome/browser/views/options/options_window_view.cc
@@ -15,6 +15,9 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
+#ifdef CHROME_PERSONALIZATION
+#include "chrome/personalization/views/user_data_page_view.h"
+#endif
 #include "chrome/views/dialog_delegate.h"
 #include "chrome/views/tabbed_pane.h"
 #include "chrome/views/root_view.h"
@@ -183,16 +186,27 @@ void OptionsWindowView::Init() {
   tabs_->SetListener(this);
   AddChildView(tabs_);
 
+  int tab_index = 0;
   GeneralPageView* general_page = new GeneralPageView(profile_);
-  tabs_->AddTabAtIndex(0, l10n_util::GetString(IDS_OPTIONS_GENERAL_TAB_LABEL),
+  tabs_->AddTabAtIndex(tab_index++,
+                       l10n_util::GetString(IDS_OPTIONS_GENERAL_TAB_LABEL),
                        general_page, false);
 
   ContentPageView* content_page = new ContentPageView(profile_);
-  tabs_->AddTabAtIndex(1, l10n_util::GetString(IDS_OPTIONS_CONTENT_TAB_LABEL),
+  tabs_->AddTabAtIndex(tab_index++,
+                       l10n_util::GetString(IDS_OPTIONS_CONTENT_TAB_LABEL),
                        content_page, false);
 
+#ifdef CHROME_PERSONALIZATION
+  UserDataPageView* user_data_page = new UserDataPageView(profile_);
+  tabs_->AddTabAtIndex(tab_index++,
+                       l10n_util::GetString(IDS_OPTIONS_USER_DATA_TAB_LABEL),
+                       user_data_page, false);
+#endif
+
   AdvancedPageView* advanced_page = new AdvancedPageView(profile_);
-  tabs_->AddTabAtIndex(2, l10n_util::GetString(IDS_OPTIONS_ADVANCED_TAB_LABEL),
+  tabs_->AddTabAtIndex(tab_index++,
+                       l10n_util::GetString(IDS_OPTIONS_ADVANCED_TAB_LABEL),
                        advanced_page, false);
 
   DCHECK(tabs_->GetTabCount() == OPTIONS_PAGE_COUNT);