diff options
author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 04:37:18 +0000 |
---|---|---|
committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 04:37:18 +0000 |
commit | 8cf33ba363a6bc4977808f641d34b6a4a6754fb0 (patch) | |
tree | 33d42a20815c206341cc19cb4cd641e73a3b43a2 | |
parent | 720de3912944abf1e6aee65f14a1085c625592e9 (diff) | |
download | chromium_src-8cf33ba363a6bc4977808f641d34b6a4a6754fb0.zip chromium_src-8cf33ba363a6bc4977808f641d34b6a4a6754fb0.tar.gz chromium_src-8cf33ba363a6bc4977808f641d34b6a4a6754fb0.tar.bz2 |
Land new resource for content-setting images.
Additionally, note in the Mac code that the icon padding is the same
as for views. Because that's what the bug was originally about.
BUG=42485
TEST=content settings still look right.
Review URL: http://codereview.chromium.org/3034003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52610 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/app/theme/blocked_cookies.png | bin | 658 -> 1776 bytes | |||
-rw-r--r-- | chrome/app/theme/blocked_images.png | bin | 352 -> 1410 bytes | |||
-rw-r--r-- | chrome/app/theme/blocked_javascript.png | bin | 771 -> 1722 bytes | |||
-rw-r--r-- | chrome/app/theme/blocked_plugins.png | bin | 784 -> 1821 bytes | |||
-rw-r--r-- | chrome/app/theme/blocked_popups.png | bin | 357 -> 1407 bytes | |||
-rw-r--r-- | chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.mm | 5 |
6 files changed, 3 insertions, 2 deletions
diff --git a/chrome/app/theme/blocked_cookies.png b/chrome/app/theme/blocked_cookies.png Binary files differindex ee8a01d..fa2e718 100644 --- a/chrome/app/theme/blocked_cookies.png +++ b/chrome/app/theme/blocked_cookies.png diff --git a/chrome/app/theme/blocked_images.png b/chrome/app/theme/blocked_images.png Binary files differindex 945a73f..5563ca5 100644 --- a/chrome/app/theme/blocked_images.png +++ b/chrome/app/theme/blocked_images.png diff --git a/chrome/app/theme/blocked_javascript.png b/chrome/app/theme/blocked_javascript.png Binary files differindex d588c8d..3467f72 100644 --- a/chrome/app/theme/blocked_javascript.png +++ b/chrome/app/theme/blocked_javascript.png diff --git a/chrome/app/theme/blocked_plugins.png b/chrome/app/theme/blocked_plugins.png Binary files differindex 70197fa..8487cfc 100644 --- a/chrome/app/theme/blocked_plugins.png +++ b/chrome/app/theme/blocked_plugins.png diff --git a/chrome/app/theme/blocked_popups.png b/chrome/app/theme/blocked_popups.png Binary files differindex 7ab224e..b58634d 100644 --- a/chrome/app/theme/blocked_popups.png +++ b/chrome/app/theme/blocked_popups.png diff --git a/chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.mm b/chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.mm index bd37113..9e9805a 100644 --- a/chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.mm +++ b/chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.mm @@ -52,8 +52,9 @@ const CGFloat kLeftDecorationXOffset = 3.0; // TODO(shess): Why is this different from |kLeftDecorationXOffset|? const CGFloat kRightDecorationXOffset = 4.0; -// The amount of padding on either side reserved for drawing decorations. -const CGFloat kDecorationHorizontalPad = 3; +// The amount of padding on either side reserved for drawing +// decorations. [Views has |kItemPadding| == 3.] +const CGFloat kDecorationHorizontalPad = 3.0; // How long to wait for mouse-up on the location icon before assuming // that the user wants to drag. |