Add content settings page action for Pepper broker authorization.

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

 // Copyright (c) 2012 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/content_settings/content_setting_bubble_cocoa.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 72 matching lines @@
 - (NSButton*)hyperlinkButtonWithFrame:(NSRect)frame
                                 title:(NSString*)title
                                  icon:(NSImage*)icon
                        referenceFrame:(NSRect)referenceFrame;
 - (void)initializeBlockedPluginsList;
 - (void)initializeTitle;
 - (void)initializeRadioGroup;
 - (void)initializePopupList;
 - (void)initializeGeoLists;
 - (void)sizeToFitLoadButton;
-- (void)sizeToFitManageDoneButtons;
+- (void)initManageDoneButtons;
 - (void)removeInfoButton;
 - (void)popupLinkClicked:(id)sender;
 - (void)clearGeolocationForCurrentHost:(id)sender;
 @end
 
 @implementation ContentSettingBubbleController
 
 + (ContentSettingBubbleController*)
     showForModel:(ContentSettingBubbleModel*)contentSettingBubbleModel
     parentWindow:(NSWindow*)parentWindow
@@ skipping 11 matching lines @@
   // This method takes ownership of |contentSettingBubbleModel| in all cases.
   scoped_ptr<ContentSettingBubbleModel> model(contentSettingBubbleModel);
   DCHECK(model.get());
 
   ContentSettingsType settingsType = model->content_type();
   NSString* nibPath = @"";
   switch (settingsType) {
     case CONTENT_SETTINGS_TYPE_COOKIES:
       nibPath = @"ContentBlockedCookies"; break;
     case CONTENT_SETTINGS_TYPE_IMAGES:
-      nibPath = @"ContentBlockedImages"; break;
     case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
-      nibPath = @"ContentBlockedJavaScript"; break;
+    case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:
+      nibPath = @"ContentBlockedSimple"; break;

[Nico, 2012/12/14 23:02:26]

Do you feel the nib files for the content settings bubbles are worth it? I was
considering moving all the content settings bubble stuff from nibs to code -- do
you have an opinion on that?

[Bernhard Bauer, 2012/12/15 05:44:04]

Yes, that probably makes sense. For starters we could unify all the different
nibs here to a single one, and then later create that in code instead of loading
and modifying it.

     case CONTENT_SETTINGS_TYPE_PLUGINS:
       nibPath = @"ContentBlockedPlugins"; break;
     case CONTENT_SETTINGS_TYPE_POPUPS:
       nibPath = @"ContentBlockedPopups"; break;
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       nibPath = @"ContentBlockedGeolocation"; break;
     case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
       nibPath = @"ContentBlockedMixedScript"; break;
     case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
       nibPath = @"ContentProtocolHandlers"; break;
     // These content types have no bubble:
     case CONTENT_SETTINGS_TYPE_DEFAULT:
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
     case CONTENT_SETTINGS_TYPE_INTENTS:
     case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE:
     case CONTENT_SETTINGS_TYPE_FULLSCREEN:
     case CONTENT_SETTINGS_TYPE_MOUSELOCK:
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
-    case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:
     case CONTENT_SETTINGS_NUM_TYPES:
       NOTREACHED();
   }
   if ((self = [super initWithWindowNibPath:nibPath
                               parentWindow:parentWindow
                                 anchoredAt:anchoredAt])) {
     contentSettingBubbleModel_.reset(model.release());
     [self showWindow:nil];
   }
   return self;
@@ skipping 250 matching lines @@
   // Resize horizontally to fit button if necessary.
   NSRect windowFrame = [[self window] frame];
   int widthNeeded = NSWidth([loadButton_ frame]) +
       2 * NSMinX([loadButton_ frame]);
   if (NSWidth(windowFrame) < widthNeeded) {
     windowFrame.size.width = widthNeeded;
     [[self window] setFrame:windowFrame display:NO];
   }
 }
 
-- (void)sizeToFitManageDoneButtons {
+- (void)initManageDoneButtons {
+  const ContentSettingBubbleModel::BubbleContent& content =
+      contentSettingBubbleModel_->bubble_content();
+  [manageButton_ setTitle:base::SysUTF8ToNSString(content.manage_link)];
+  [GTMUILocalizerAndLayoutTweaker sizeToFitView:manageButton_];
+
   CGFloat actualWidth = NSWidth([[[self window] contentView] frame]);
   CGFloat requiredWidth = NSMaxX([manageButton_ frame]) + kManageDonePadding +
       NSWidth([[doneButton_ superview] frame]) - NSMinX([doneButton_ frame]);
   if (requiredWidth <= actualWidth || !doneButton_ || !manageButton_)
     return;
 
   // Resize window, autoresizing takes care of the rest.
   NSSize size = NSMakeSize(requiredWidth - actualWidth, 0);
   size = [[[self window] contentView] convertSize:size toView:nil];
   NSRect frame = [[self window] frame];
   frame.origin.x -= size.width;
   frame.size.width += size.width;
   [[self window] setFrame:frame display:NO];
 }
 
 - (void)awakeFromNib {
   [super awakeFromNib];
 
   [[self bubble] setArrowLocation:info_bubble::kTopRight];
 
   // Adapt window size to bottom buttons. Do this before all other layouting.
-  [self sizeToFitManageDoneButtons];
+  [self initManageDoneButtons];
 
   [self initializeTitle];
 
   ContentSettingsType type = contentSettingBubbleModel_->content_type();
   if (type == CONTENT_SETTINGS_TYPE_PLUGINS) {
     [self sizeToFitLoadButton];
     [self initializeBlockedPluginsList];
   }
 
   if (allowBlockRadioGroup_)  // not bound in cookie bubble xib
@@ skipping 41 matching lines @@
 - (IBAction)manageBlocking:(id)sender {
   contentSettingBubbleModel_->OnManageLinkClicked();
 }
 
 - (IBAction)closeBubble:(id)sender {
   contentSettingBubbleModel_->OnDoneClicked();
   [self close];
 }
 
 @end  // ContentSettingBubbleController