| Index: chrome/browser/ui/cocoa/color_chooser_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/color_chooser_mac.mm b/chrome/browser/ui/cocoa/color_chooser_mac.mm
|
| index 0d219a9649127bc1f453d96f2560537a09ac744f..ed5a26b58649d716cb006ea120a82ea6bc4bf71d 100644
|
| --- a/chrome/browser/ui/cocoa/color_chooser_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/color_chooser_mac.mm
|
| @@ -139,7 +139,16 @@ void ColorChooserMac::SetSelectedColor(SkColor color) {
|
| nonUserChange_ = NO;
|
| return;
|
| }
|
| + nonUserChange_ = NO;
|
| NSColor* color = [panel color];
|
| + if ([[color colorSpaceName] isEqualToString:NSNamedColorSpace]) {
|
| + color = [color colorUsingColorSpace:[NSColorSpace genericRGBColorSpace]];
|
| + // Some colors in "Developer" palette in "Color Palettes" tab can't be
|
| + // converted to RGB. We just ignore such colors.
|
| + // TODO(tkent): We should notice the rejection to users.
|
| + if (!color)
|
| + return;
|
| + }
|
| if ([color colorSpace] == [NSColorSpace genericRGBColorSpace]) {
|
| // genericRGB -> deviceRGB conversion isn't ignorable. We'd like to use RGB
|
| // values shown in NSColorPanel UI.
|
| @@ -154,7 +163,6 @@ void ColorChooserMac::SetSelectedColor(SkColor color) {
|
| chooser_->DidChooseColorInColorPanel(skia::NSDeviceColorToSkColor(
|
| [[panel color] colorUsingColorSpaceName:NSDeviceRGBColorSpace]));
|
| }
|
| - nonUserChange_ = NO;
|
| }
|
|
|
| - (void)setColor:(NSColor*)color {
|
|
|