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

chrome/browser/content_setting_bubble_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_bubble_model.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/blocked_popup_container.h"
@@ skipping 70 matching lines @@
     COMPILE_ASSERT(arraysize(kBlockedTitleIDs) == CONTENT_SETTINGS_NUM_TYPES,
                    Need_a_setting_for_every_content_settings_type);
     COMPILE_ASSERT(arraysize(kResourceSpecificBlockedTitleIDs) ==
         CONTENT_SETTINGS_NUM_TYPES,
         Need_a_setting_for_every_content_settings_type);
     const int *title_ids = kBlockedTitleIDs;
     if (tab_contents() &&
         tab_contents()->GetTabSpecificContentSettings()->IsContentAccessed(
             content_type()) &&
         !tab_contents()->GetTabSpecificContentSettings()->IsContentBlocked(
-            content_type()) &&
-        !CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableCookiePrompt)) {
+            content_type())) {
       title_ids = kAccessedTitleIDs;
     } else if (!bubble_content().resource_identifiers.empty()) {
       title_ids = kResourceSpecificBlockedTitleIDs;
     }
     if (title_ids[content_type()])
       set_title(l10n_util::GetStringUTF8(title_ids[content_type()]));
   }
 
   void SetManageLink() {
     static const int kLinkIDs[] = {
@@ skipping 16 matching lines @@
   }
 };
 
 class ContentSettingTitleLinkAndInfoModel
     : public ContentSettingTitleAndLinkModel {
  public:
   ContentSettingTitleLinkAndInfoModel(TabContents* tab_contents,
                                       Profile* profile,
                                       ContentSettingsType content_type)
       : ContentSettingTitleAndLinkModel(tab_contents, profile, content_type) {
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableCookiePrompt))
-      SetInfoLink();
+    SetInfoLink();
   }
 
  private:
   void SetInfoLink() {
     static const int kInfoIDs[] = {
       IDS_BLOCKED_COOKIES_INFO,
       0,  // Images do not have an info link.
       0,  // Javascript doesn't have an info link.
       0,  // Plugins do not have an info link.
       0,  // Popups do not have an info link.
@@ skipping 328 matching lines @@
   bubble_content_.resource_identifiers.insert(resource_identifier);
 }
 
 void ContentSettingBubbleModel::Observe(NotificationType type,
                                         const NotificationSource& source,
                                         const NotificationDetails& details) {
   DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);
   DCHECK(source == Source<TabContents>(tab_contents_));
   tab_contents_ = NULL;
 }