Page Info (native Mac): Change "Details" link (sec. panel) to "Learn more" (help center).

chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

 // Copyright 2014 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.
 
 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
 #include "base/i18n/rtl.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/certificate_viewer.h"
-#include "chrome/browser/devtools/devtools_toggle_action.h"
-#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/website_settings/permission_selector_button.h"
 #import "chrome/browser/ui/tab_dialogs.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
-#include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_chromium_strings.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
@@ skipping 145 matching lines @@
 bool IsInternalURL(const GURL& url) {
   return url.SchemeIs(content::kChromeUIScheme) ||
          url.SchemeIs(content::kChromeDevToolsScheme) ||
          url.SchemeIs(extensions::kExtensionScheme) ||
          url.SchemeIs(content::kViewSourceScheme);
 }
 
 - (id)initWithParentWindow:(NSWindow*)parentWindow
     websiteSettingsUIBridge:(WebsiteSettingsUIBridge*)bridge
                 webContents:(content::WebContents*)webContents
-                        url:(const GURL&)url
-         isDevToolsDisabled:(BOOL)isDevToolsDisabled {
+                        url:(const GURL&)url {
   DCHECK(parentWindow);
 
   webContents_ = webContents;
   permissionsPresent_ = NO;
-  isDevToolsDisabled_ = isDevToolsDisabled;
   url_ = url;
 
   // Use an arbitrary height; it will be changed in performLayout.
   NSRect contentRect = NSMakeRect(0, 0, [self defaultWindowWidth], 1);
   // Create an empty window into which content is placed.
   base::scoped_nsobject<InfoBubbleWindow> window(
       [[InfoBubbleWindow alloc] initWithContentRect:contentRect
                                           styleMask:NSBorderlessWindowMask
                                             backing:NSBackingStoreBuffered
                                               defer:NO]);
@@ skipping 121 matching lines @@
   securityDetailsField_ = [self addText:base::string16()
                                withSize:[NSFont smallSystemFontSize]
                                    bold:NO
                                  toView:securitySectionView
                                 atPoint:controlOrigin];
 
   // These will be created only if necessary.
   resetDecisionsField_ = nil;
   resetDecisionsButton_ = nil;
 
-  NSString* securityDetailsButtonText =
-      l10n_util::GetNSString(IDS_WEBSITE_SETTINGS_DETAILS_LINK);
-  // Note: The security details button may be removed from the superview in
-  // -performLayout in order to hide it (depending on the connection).
-  securityDetailsButton_ = [self addLinkButtonWithText:securityDetailsButtonText
+  NSString* connectionHelpButtonText =
+      l10n_util::GetNSString(IDS_LEARN_MORE);
+  connectionHelpButton_ = [self addLinkButtonWithText:connectionHelpButtonText
                                                 toView:securitySectionView];
-  [securityDetailsButton_ setTarget:self];
-  [securityDetailsButton_ setAction:@selector(showSecurityDetails:)];
+  [connectionHelpButton_ setTarget:self];
+  [connectionHelpButton_ setAction:@selector(openConnectionHelp:)];
 
   return securitySectionView.get();
 }
 
 // Create and return a subview for the site settings and add it to the given
 // |superview|. |superview| retains the new view.
 - (NSView*)addSiteSettingsSectionToView:(NSView*)superview {
   base::scoped_nsobject<NSView> siteSettingsSectionView(
       [[FlippedView alloc] initWithFrame:[superview frame]]);
   [superview addSubview:siteSettingsSectionView];
@@ skipping 37 matching lines @@
   DCHECK(webContents_);
   DCHECK(presenter_);
   presenter_->RecordWebsiteSettingsAction(
       WebsiteSettings::WEBSITE_SETTINGS_SITE_SETTINGS_OPENED);
   webContents_->OpenURL(content::OpenURLParams(
       GURL(chrome::kChromeUIContentSettingsURL), content::Referrer(),
       WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
       false));
 }
 
-// Handler for the site settings button below the list of permissions.
 // TODO(lgarron): Move some of this to the presenter for separation of concerns
 // and platform unification. (https://crbug.com/571533)
-- (void)showSecurityDetails:(id)sender {
+- (void)openConnectionHelp:(id)sender {
   DCHECK(webContents_);
   DCHECK(presenter_);
   presenter_->RecordWebsiteSettingsAction(
-      WebsiteSettings::WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED);
-
-  if (isDevToolsDisabled_) {
-    [self showCertificateInfo:sender];
-  } else {
-    DevToolsWindow::OpenDevToolsWindow(
-        webContents_, DevToolsToggleAction::ShowSecurityPanel());
-  }
+      WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED);
+  webContents_->OpenURL(content::OpenURLParams(
+      GURL(chrome::kPageInfoHelpCenterURL), content::Referrer(),
+      WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
+      false));
 }
 
 // Handler for the link button to show certificate information.
 - (void)showCertificateInfo:(id)sender {
   DCHECK(certificate_.get());
   DCHECK(presenter_);
   presenter_->RecordWebsiteSettingsAction(
       WebsiteSettings::WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED);
   ShowCertificateViewer(webContents_, [self parentWindow], certificate_.get());
 }
@@ skipping 67 matching lines @@
   CGFloat yPos = 0;
 
   [self sizeTextFieldHeightToFit:securitySummaryField_];
   yPos = [self setYPositionOfView:securitySummaryField_
                                to:yPos + kSectionVerticalPadding];
 
   [self sizeTextFieldHeightToFit:securityDetailsField_];
   yPos = [self setYPositionOfView:securityDetailsField_
                                to:yPos + kSecurityParagraphSpacing];
 
-  if (isDevToolsDisabled_ && !certificate_) {
-    // -removeFromSuperview is idempotent.
-    [securityDetailsButton_ removeFromSuperview];
-  } else {
-    // -addSubview is idempotent.
-    [securitySectionView_ addSubview:securityDetailsButton_];
-    [securityDetailsButton_
-        setFrameOrigin:NSMakePoint(
-                           kSectionHorizontalPadding - kLinkButtonXAdjustment,
-                           yPos)];
-    yPos = NSMaxY([securityDetailsButton_ frame]);
-  }
+  [connectionHelpButton_
+      setFrameOrigin:NSMakePoint(
+                         kSectionHorizontalPadding - kLinkButtonXAdjustment,
+                         yPos)];
+  yPos = NSMaxY([connectionHelpButton_ frame]);
 
   if (resetDecisionsButton_) {
     DCHECK(resetDecisionsField_);
     yPos = [self setYPositionOfView:resetDecisionsField_
                                  to:yPos + kSecurityParagraphSpacing];
     [resetDecisionsButton_
         setFrameOrigin:NSMakePoint(NSMinX([resetDecisionsButton_ frame]) -
                                        kLinkButtonXAdjustment,
                                    yPos)];
     yPos = NSMaxY([resetDecisionsButton_ frame]);
@@ skipping 648 matching lines @@
 
   // Don't show the popup if it's already being shown. Since this method is
   // called each time the location icon is clicked, each click toggles the popup
   // in and out.
   if (g_is_popup_showing)
     return;
 
   // Create the bridge. This will be owned by the bubble controller.
   WebsiteSettingsUIBridge* bridge = new WebsiteSettingsUIBridge(web_contents);
 
-  bool is_devtools_disabled =
-      profile->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled);
-
   // Create the bubble controller. It will dealloc itself when it closes,
   // resetting |g_is_popup_showing|.
   WebsiteSettingsBubbleController* bubble_controller =
       [[WebsiteSettingsBubbleController alloc]
              initWithParentWindow:parent
           websiteSettingsUIBridge:bridge
                       webContents:web_contents
-                              url:virtual_url
-               isDevToolsDisabled:is_devtools_disabled];
+                              url:virtual_url];
 
   if (!IsInternalURL(virtual_url)) {
     // Initialize the presenter, which holds the model and controls the UI.
     // This is also owned by the bubble controller.
     WebsiteSettings* presenter = new WebsiteSettings(
         bridge, profile,
         TabSpecificContentSettings::FromWebContents(web_contents), web_contents,
         virtual_url, security_info);
     [bubble_controller setPresenter:presenter];
   }
@@ skipping 21 matching lines @@
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     ChosenObjectInfoList chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:std::move(chosen_object_info_list)];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
 }