Use a different string and icon for chrome-extension pages in Page Info Bubble.

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/string_number_conversions.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/browser/ui/website_settings/website_settings_utils.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 "content/public/browser/cert_store.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/user_metrics.h"
@@ skipping 135 matching lines @@
 
 @implementation WebsiteSettingsBubbleController
 
 - (CGFloat)defaultWindowWidth {
   return kDefaultWindowWidth;
 }
 
 - (id)initWithParentWindow:(NSWindow*)parentWindow
     websiteSettingsUIBridge:(WebsiteSettingsUIBridge*)bridge
                 webContents:(content::WebContents*)webContents
-             isInternalPage:(BOOL)isInternalPage
+                 bubbleType:(BubbleType)bubbleType
          isDevToolsDisabled:(BOOL)isDevToolsDisabled {
   DCHECK(parentWindow);
 
   webContents_ = webContents;
   permissionsPresent_ = NO;
   isDevToolsDisabled_ = isDevToolsDisabled;
 
   // 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.
@@ skipping 10 matching lines @@
 
     // Create the container view that uses flipped coordinates.
     NSRect contentFrame = NSMakeRect(0, 0, [self defaultWindowWidth], 300);
     contentView_.reset(
         [[FlippedView alloc] initWithFrame:contentFrame]);
 
     // Replace the window's content.
     [[[self window] contentView] setSubviews:
         [NSArray arrayWithObject:contentView_.get()]];
 
-    if (isInternalPage)
-      [self initializeContentsForInternalPage];
+    if (bubbleType == INTERNAL_PAGE)
+      [self initializeContentsForInternalPage:false];
+    else if (bubbleType == EXTENSION_PAGE)
+      [self initializeContentsForInternalPage:true];
     else
       [self initializeContents];
 
     bridge_.reset(bridge);
     bridge_->set_bubble_controller(self);
   }
   return self;
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   if (presenter_.get())
     presenter_->OnUIClosing();
   presenter_.reset();
   [super windowWillClose:notification];
 }
 
 - (void)setPresenter:(WebsiteSettings*)presenter {
   presenter_.reset(presenter);
 }
 
 // Create the subviews for the bubble for internal Chrome pages.
-- (void)initializeContentsForInternalPage {
+- (void)initializeContentsForInternalPage:(BOOL)isExtensionPage {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   NSPoint controlOrigin = NSMakePoint(
       kInternalPageFramePadding,
       kInternalPageFramePadding + info_bubble::kBubbleArrowHeight);
   NSImage* productLogoImage =
-      rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToNSImage();
+      rb.GetNativeImageNamed(isExtensionPage ? IDR_PLUGINS_FAVICON
+                                             : IDR_PRODUCT_LOGO_16)
+          .ToNSImage();
   NSImageView* imageView = [self addImageWithSize:[productLogoImage size]
                                            toView:contentView_
                                           atPoint:controlOrigin];
   [imageView setImage:productLogoImage];
 
   NSRect imageFrame = [imageView frame];
   controlOrigin.x += NSWidth(imageFrame) + kInternalPageImageSpacing;
-  base::string16 text = l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE);
+  base::string16 text =
+      l10n_util::GetStringUTF16(isExtensionPage ? IDS_PAGE_INFO_EXTENSION_PAGE
+                                                : IDS_PAGE_INFO_INTERNAL_PAGE);
   NSTextField* textField = [self addText:text
                                 withSize:[NSFont smallSystemFontSize]
                                     bold:NO
                                   toView:contentView_
                                  atPoint:controlOrigin];
   // Center the image vertically with the text. Previously this code centered
   // the text vertically while holding the image in place. That produced correct
   // results when the image, at 26x26, was taller than (or just slightly
   // shorter) than the text, but produced incorrect results once the icon
   // shrank to 16x16. The icon should now always be shorter than the text.
@@ skipping 843 matching lines @@
     content::WebContents* web_contents,
     const GURL& url,
     const security_state::SecurityStateModel::SecurityInfo& security_info) {
   if (chrome::ToolkitViewsDialogsEnabled()) {
     chrome::ShowWebsiteSettingsBubbleViewsAtPoint(
         gfx::ScreenPointFromNSPoint(AnchorPointForWindow(parent)), profile,
         web_contents, url, security_info);
     return;
   }
 
-  bool is_internal_page = InternalChromePage(url);
+  BubbleType bubble_type = WEB_PAGE;
+  if (url.SchemeIs("chrome"))

[palmer, 2016/04/26 22:43:45]

Nit: Better to use the kFooScheme constants?

[meacer, 2016/04/26 23:01:16]

Done.

+    bubble_type = INTERNAL_PAGE;
+  else if (url.SchemeIs("chrome-extension"))
+    bubble_type = EXTENSION_PAGE;
 
   // 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.
   WebsiteSettingsBubbleController* bubble_controller =
       [[WebsiteSettingsBubbleController alloc]
              initWithParentWindow:parent
           websiteSettingsUIBridge:bridge
                       webContents:web_contents
-                   isInternalPage:is_internal_page
+                       bubbleType:bubble_type
                isDevToolsDisabled:is_devtools_disabled];
 
-  if (!is_internal_page) {
+  if (bubble_type == WEB_PAGE) {
     // 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,
         url, security_info, content::CertStore::GetInstance());
     [bubble_controller setPresenter:presenter];
   }
 
   [bubble_controller showWindow:nil];
@@ skipping 19 matching lines @@
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     const ChosenObjectInfoList& chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:chosen_object_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
 }