Do right-alignment of popups when WebKit indicates to do so.

webkit/glue/webmenurunner_mac.mm

 // Copyright (c) 2009 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 "webkit/glue/webmenurunner_mac.h"
 
 #include "base/sys_string_conversions.h"
 
 namespace {
 
 const CGFloat kPopupXOffset = -10.0f;
 BOOL gNewNSMenuAPI;
 
 }  // namespace
 
 #if !defined(MAC_OS_X_VERSION_10_6) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
 @interface NSMenu (SnowLeopardSDKDeclarations)
 - (BOOL)popUpMenuPositioningItem:(NSMenuItem *)item
                       atLocation:(NSPoint)location
                           inView:(NSView *)view;
 - (void)setFont:(NSFont *)font;
 @end
 #endif
 
 @interface WebMenuRunner (PrivateAPI)
 
 // Worker function used during initialization.
-- (void)addItem:(const WebMenuItem&)item;
+- (void)addItem:(const WebMenuItem&)item
+ withAttributes:(NSDictionary*)attrs;
 
 // A callback for the menu controller object to call when an item is selected
 // from the menu. This is not called if the menu is dismissed without a
 // selection.
 - (void)menuItemSelected:(id)sender;
 
 @end  // WebMenuRunner (PrivateAPI)
 
 @implementation WebMenuRunner
 
 - (id)initWithItems:(const std::vector<WebMenuItem>&)items
-           fontSize:(CGFloat)fontSize {
+           fontSize:(CGFloat)fontSize
+       rightAligned:(BOOL)rightAligned {
   static BOOL newNSMenuAPIInitialized = NO;
   if (!newNSMenuAPIInitialized) {
     newNSMenuAPIInitialized = YES;
     gNewNSMenuAPI = [NSMenu instancesRespondToSelector:
         @selector(popUpMenuPositioningItem:atLocation:inView:)] &&
         [NSMenu instancesRespondToSelector:@selector(setFont:)];
   }
 
   if ((self = [super init])) {
     menu_.reset([[NSMenu alloc] initWithTitle:@""]);
     if (gNewNSMenuAPI)
       [menu_ setFont:[NSFont menuFontOfSize:fontSize]];
     [menu_ setAutoenablesItems:NO];
     index_ = -1;
     fontSize_ = fontSize;
+    scoped_nsobject<NSDictionary> attrs;
+    if (rightAligned) {
+      // NB: Right-aligning menu items in this manner is known to not work in
+      // Mac OS X 10.5.
+      scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
+          [[NSMutableParagraphStyle alloc] init]);
+      [paragraphStyle setAlignment:NSRightTextAlignment];
+      attrs.reset([[NSDictionary alloc] initWithObjectsAndKeys:
+          paragraphStyle, NSParagraphStyleAttributeName, nil]);
+    }
     for (size_t i = 0; i < items.size(); ++i)
-      [self addItem:items[i]];
+      [self addItem:items[i] withAttributes:attrs];
   }
   return self;
 }
 
-- (void)addItem:(const WebMenuItem&)item {
+- (void)addItem:(const WebMenuItem&)item
+ withAttributes:(NSDictionary*)attrs {
   if (item.type == WebMenuItem::SEPARATOR) {
     [menu_ addItem:[NSMenuItem separatorItem]];
     return;
   }
 
   NSString* title = base::SysUTF16ToNSString(item.label);
   NSMenuItem* menuItem = [menu_ addItemWithTitle:title
                                           action:@selector(menuItemSelected:)
                                    keyEquivalent:@""];
   [menuItem setEnabled:(item.enabled && item.type != WebMenuItem::GROUP)];
   [menuItem setTarget:self];
+  if (attrs) {
+    scoped_nsobject<NSAttributedString> attrTitle(
+        [[NSAttributedString alloc] initWithString:title
+                                        attributes:attrs]);
+    [menuItem setAttributedTitle:attrTitle];
+  }
   if (gNewNSMenuAPI)
     [menuItem setTag:[menu_ numberOfItems] - 1];
 }
 
 // Reflects the result of the user's interaction with the popup menu. If NO, the
 // menu was dismissed without the user choosing an item, which can happen if the
 // user clicked outside the menu region or hit the escape key. If YES, the user
 // selected an item from the menu.
 - (BOOL)menuItemWasChosen {
   return menuItemWasChosen_;
@@ skipping 91 matching lines @@
                            characters:@""
           charactersIgnoringModifiers:escape_str
                             isARepeat:NO
                               keyCode:0x1B];
   }
 
   return event;
 }
 
 }  // namespace webkit_glue