Enable the new page info bubble by default.

chrome/browser/page_info_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/page_info_model.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 164 matching lines @@
         IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT,
         subject_name,
         base::IntToString16(ssl.security_bits())));
     if (ssl.displayed_insecure_content() || ssl.ran_insecure_content()) {
       // The old SSL dialog only had good and bad state, so for the old
       // implementation we raise an error on finding mixed content. The new
       // SSL info bubble has a warning state for displaying insecure content,
       // so we check. The command line check will go away once we eliminate
       // the old dialogs.
       const CommandLine* command_line(CommandLine::ForCurrentProcess());
-      if (command_line->HasSwitch(switches::kEnableNewPageInfoBubble) &&
+      if (!command_line->HasSwitch(switches::kDisableNewPageInfoBubble) &&
           !ssl.ran_insecure_content()) {
         icon_id = ICON_STATE_WARNING_MINOR;
       } else {
         icon_id = ICON_STATE_ERROR;
       }
       description.assign(l10n_util::GetStringFUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK,
           description,
           l10n_util::GetStringUTF16(ssl.ran_insecure_content() ?
               IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR :
@@ skipping 82 matching lines @@
 PageInfoModel::SectionInfo PageInfoModel::GetSectionInfo(int index) {
   DCHECK(index < static_cast<int>(sections_.size()));
   return sections_[index];
 }
 
 gfx::NativeImage PageInfoModel::GetIconImage(SectionStateIcon icon_id) {
   if (icon_id == ICON_NONE)
     return NULL;
   // TODO(rsesek): Remove once the window is replaced with the bubble.
   const CommandLine* command_line(CommandLine::ForCurrentProcess());
-  if (!command_line->HasSwitch(switches::kEnableNewPageInfoBubble) &&
+  if (command_line->HasSwitch(switches::kDisableNewPageInfoBubble) &&
       icon_id != ICON_STATE_OK) {
     return icons_[ICON_STATE_WARNING_MAJOR];
   }
-  // The buble uses new, various icons.
+  // The bubble uses new, various icons.
   return icons_[icon_id];
 }
 
 void PageInfoModel::OnGotVisitCountToHost(HistoryService::Handle handle,
                                           bool found_visits,
                                           int count,
                                           base::Time first_visit) {
   if (!found_visits) {
     // This indicates an error, such as the page wasn't http/https; do nothing.
     return;
   }
 
   bool visited_before_today = false;
   if (count) {
     base::Time today = base::Time::Now().LocalMidnight();
     base::Time first_visit_midnight = first_visit.LocalMidnight();
     visited_before_today = (first_visit_midnight < today);
   }
 
   // We only show the Site Information heading for the new dialogs.
   string16 title;
   const CommandLine* command_line(CommandLine::ForCurrentProcess());
-  bool as_bubble = command_line->HasSwitch(switches::kEnableNewPageInfoBubble);
+  bool as_bubble = !command_line->HasSwitch(
+      switches::kDisableNewPageInfoBubble);
   if (as_bubble)
     title = l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE);
 
   if (!visited_before_today) {
     sections_.push_back(SectionInfo(
         ICON_STATE_WARNING_MAJOR,
         l10n_util::GetStringUTF16(
             IDS_PAGE_INFO_SECURITY_TAB_PERSONAL_HISTORY_TITLE),
         title,
         l10n_util::GetStringUTF16(
@@ skipping 36 matching lines @@
 gfx::NativeImage PageInfoModel::GetBitmapNamed(int resource_id) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gfx::NativeImage image = rb.GetNativeImageNamed(resource_id);
 #if defined(OS_MACOSX)
   // Unlike other platforms, the Mac ResourceBundle does not keep a shared image
   // cache. These are released in the dtor.
   mac_util::NSObjectRetain(image);
 #endif
   return image;
 }