summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerikchen <erikchen@chromium.org>2015-09-08 16:35:44 -0700
committererikchen <erikchen@chromium.org>2015-09-08 23:37:17 +0000
commitcaffab603c72f1c44fffa4e83d793ac71ba0b823 (patch)
treea69b895963462371d2f47e95ce6669c379855391
parentecc1246519e8a821044a6211d5e68e97b9351dda (diff)
downloadchromium_src-caffab603c72f1c44fffa4e83d793ac71ba0b823.zip
chromium_src-caffab603c72f1c44fffa4e83d793ac71ba0b823.tar.gz
chromium_src-caffab603c72f1c44fffa4e83d793ac71ba0b823.tar.bz2
Merge: "mac: Fix a focus ring visual bug in the media content settings bubble." to 2490.
> The parent view of the button was too small, and the button lay outside the > bounds of its parent view. Increasing the size of its parent view fixed the > problem. > > BUG=525544 > > Review URL: https://codereview.chromium.org/1312163006 > > Cr-Commit-Position: refs/heads/master@{#347549} BUG=525544 TBR=andresantoso@chromium.org, groby@chromium.org Review URL: https://codereview.chromium.org/1328673004 . Cr-Commit-Position: refs/branch-heads/2490@{#192} Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
-rw-r--r--chrome/app/nibs/ContentBlockedMedia.xib6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/app/nibs/ContentBlockedMedia.xib b/chrome/app/nibs/ContentBlockedMedia.xib
index ef3a364..579798d 100644
--- a/chrome/app/nibs/ContentBlockedMedia.xib
+++ b/chrome/app/nibs/ContentBlockedMedia.xib
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F1077" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F1112" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1060" identifier="macosx"/>
<development version="5100" identifier="xcode"/>
@@ -76,7 +76,7 @@
</subviews>
</customView>
<customView id="29" customClass="GTMWidthBasedTweaker">
- <rect key="frame" x="193" y="0.0" width="123" height="37"/>
+ <rect key="frame" x="193" y="0.0" width="123" height="41"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<button verticalHuggingPriority="750" id="17">
@@ -96,7 +96,7 @@ DQ
</subviews>
</customView>
<customView id="28" customClass="GTMWidthBasedTweaker">
- <rect key="frame" x="0.0" y="0.0" width="194" height="37"/>
+ <rect key="frame" x="0.0" y="0.0" width="194" height="41"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button verticalHuggingPriority="750" id="15">