Add a global on/off switch for content settings and expose a toggle on the Website Settings options…

chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

 // Copyright 2013 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/android/content_settings/popup_blocked_infobar_delegate.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 44 matching lines @@
     PopupBlockedInfoBarDelegate::AsPopupBlockedInfoBarDelegate() {
   return this;
 }
 
 PopupBlockedInfoBarDelegate::PopupBlockedInfoBarDelegate(
     int num_popups,
     const GURL& url,
     HostContentSettingsMap* map)
     : ConfirmInfoBarDelegate(), num_popups_(num_popups), url_(url), map_(map) {
   content_settings::SettingInfo setting_info;
-  scoped_ptr<base::Value> setting(
-      map->GetWebsiteSetting(
-          url,
-          url,
-          CONTENT_SETTINGS_TYPE_POPUPS,
-          std::string(),
-          &setting_info));
+  scoped_ptr<base::Value> setting = map->GetWebsiteSetting(
+      url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string(), &setting_info);
   can_show_popups_ =
       setting_info.source != content_settings::SETTING_SOURCE_POLICY;
 }
 
 base::string16 PopupBlockedInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16Int(IDS_POPUPS_BLOCKED_INFOBAR_TEXT,
                                        num_popups_);
 }
 
 int PopupBlockedInfoBarDelegate::GetButtons() const {
@@ skipping 23 matching lines @@
   DCHECK(popup_blocker_helper);
   PopupBlockerTabHelper::PopupIdMap blocked_popups =
       popup_blocker_helper->GetBlockedPopupRequests();
   for (PopupBlockerTabHelper::PopupIdMap::iterator it = blocked_popups.begin();
       it != blocked_popups.end(); ++it)
     popup_blocker_helper->ShowBlockedPopup(it->first);
 
   return true;
 }