Cleanup: better session restore UI.

chrome/browser/ui/webui/options2/content_settings_handler.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/options2/content_settings_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 458 matching lines @@
                 IDS_MOUSE_LOCK_TAB_LABEL);
   RegisterTitle(localized_strings, "pepper-flash-cameramic",
                 IDS_PEPPER_FLASH_CAMERAMIC_TAB_LABEL);
   RegisterTitle(localized_strings, "media-stream",
                 IDS_MEDIA_STREAM_TAB_LABEL);
 
   Profile* profile = Profile::FromWebUI(web_ui());
   localized_strings->SetBoolean(
       "enable_web_intents",
       web_intents::IsWebIntentsEnabledForProfile(profile));
-  // TODO(marja): clean up the options UI after the decision on the session
-  // restore changes has stabilized.
-  localized_strings->SetBoolean(
-      "enable_restore_session_state", false);
 }
 
 void ContentSettingsHandler::InitializeHandler() {
   notification_registrar_.Add(
       this, chrome::NOTIFICATION_PROFILE_CREATED,
       content::NotificationService::AllSources());
   notification_registrar_.Add(
       this, chrome::NOTIFICATION_PROFILE_DESTROYED,
       content::NotificationService::AllSources());
 
@@ skipping 120 matching lines @@
   DictionaryValue filter_settings;
   std::string provider_id;
   filter_settings.SetString(
       ExContentSettingsTypeToGroupName(type) + ".value",
       GetSettingDefaultFromModel(type, &provider_id));
   filter_settings.SetString(
       ExContentSettingsTypeToGroupName(type) + ".managedBy", provider_id);
 
   web_ui()->CallJavascriptFunction(
       "ContentSettings.setContentFilterSettingsValue", filter_settings);
-  web_ui()->CallJavascriptFunction(
-      "BrowserOptions.setContentFilterSettingsValue", filter_settings);
 }
 
 std::string ContentSettingsHandler::GetSettingDefaultFromModel(
     const ExContentSettingsType& type, std::string* provider_id) {
   Profile* profile = Profile::FromWebUI(web_ui());
   ContentSetting default_setting;
   if (type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
     default_setting =
         DesktopNotificationServiceFactory::GetForProfile(profile)->
             GetDefaultContentSetting(provider_id);
@@ skipping 694 matching lines @@
   for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
     if (type == kExContentSettingsTypeGroupNames[i].type)
       return kExContentSettingsTypeGroupNames[i].name;
   }
 
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace options2