Remove vestigial cookie/web app permissions prompting UI now that the async U...

chrome/browser/content_setting_image_model.cc

 // Copyright (c) 2010 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/content_setting_image_model.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/profile.h"
@@ skipping 74 matching lines @@
   const int* icon_ids;
   const int* tooltip_ids;
 
   if (!content_settings) {
     set_visible(false);
     return;
   }
   if (content_settings->IsContentBlocked(get_content_settings_type())) {
     icon_ids = kBlockedIconIDs;
     tooltip_ids = kBlockedTooltipIDs;
-  } else if (!CommandLine::ForCurrentProcess()->HasSwitch(
-                 switches::kEnableCookiePrompt) &&
-             tab_contents->profile()->GetHostContentSettingsMap()->
+  } else if (tab_contents->profile()->GetHostContentSettingsMap()->
                  GetDefaultContentSetting(get_content_settings_type()) ==
                  CONTENT_SETTING_BLOCK &&
              content_settings->IsContentAccessed(get_content_settings_type())) {
     // If a content type is blocked by default and was accessed, display the
     // accessed icon.
     icon_ids = kAccessedIconIDs;
     tooltip_ids = kAccessedTooltipIDs;
   } else {
     set_visible(false);
     return;
@@ skipping 56 matching lines @@
 // static
 ContentSettingImageModel*
     ContentSettingImageModel::CreateContentSettingImageModel(
     ContentSettingsType content_settings_type) {
   if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION)
     return new ContentSettingGeolocationImageModel();
   if (content_settings_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS)
     return new ContentSettingNotificationsImageModel();
   return new ContentSettingBlockedImageModel(content_settings_type);
 }