From 8576d3230816c35b6e6b571a43b77d7270ff445e Mon Sep 17 00:00:00 2001
From: "munjal@chromium.org"
 <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 26 Oct 2011 04:36:54 +0000
Subject: Remove app notifications checkbox and piggy back on Apps checkbox in
 sync UI. Review URL: http://codereview.chromium.org/8387021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107299 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/ui/webui/sync_setup_handler.cc | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'chrome/browser/ui/webui/sync_setup_handler.cc')

diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index bd0dd7e..66b7de8 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -138,12 +138,6 @@ bool GetConfiguration(const std::string& json, SyncConfiguration* config) {
   if (sync_apps)
     config->data_types.insert(syncable::APPS);
 
-  bool sync_app_notifications;
-  if (!result->GetBoolean("syncAppNotifications", &sync_app_notifications))
-    return false;
-  if (sync_app_notifications)
-    config->data_types.insert(syncable::APP_NOTIFICATIONS);
-
   // Encryption settings.
   if (!result->GetBoolean("encryptAllData", &config->encrypt_all))
     return false;
@@ -285,7 +279,6 @@ void SyncSetupHandler::GetStaticLocalizedValues(
     { "apps", IDS_SYNC_DATATYPE_APPS },
     { "searchEngines", IDS_SYNC_DATATYPE_SEARCH_ENGINES },
     { "openTabs", IDS_SYNC_DATATYPE_TABS },
-    { "appNotifications", IDS_SYNC_DATATYPE_APP_NOTIFICATIONS },
     { "syncZeroDataTypesError", IDS_SYNC_ZERO_DATA_TYPES_ERROR },
     { "serviceUnavailableError", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR },
     { "encryptAllLabel", IDS_SYNC_ENCRYPT_ALL_LABEL },
-- 
cgit v1.1