diff options
author | gcasto@chromium.org <gcasto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 20:04:29 +0000 |
---|---|---|
committer | gcasto@chromium.org <gcasto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 20:04:29 +0000 |
commit | aa7797cc5959b3154cd4ae154a9316819ac5b74e (patch) | |
tree | ec473fe8797c1ff5cc253725771b9707de6658a4 | |
parent | 156e515ea18964047a664cf639c9909f943dc355 (diff) | |
download | chromium_src-aa7797cc5959b3154cd4ae154a9316819ac5b74e.zip chromium_src-aa7797cc5959b3154cd4ae154a9316819ac5b74e.tar.gz chromium_src-aa7797cc5959b3154cd4ae154a9316819ac5b74e.tar.bz2 |
Update icons used for password generation.
BUG=143330
Review URL: https://codereview.chromium.org/11086041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161166 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/renderer/autofill/password_generation_manager.cc | 4 | ||||
-rw-r--r-- | chrome/renderer/autofill/password_generation_manager.h | 1 | ||||
-rw-r--r-- | webkit/glue/resources/default_100_percent/password_generation.png | bin | 1264 -> 1494 bytes | |||
-rw-r--r-- | webkit/glue/resources/default_100_percent/password_generation_hover.png | bin | 0 -> 1490 bytes | |||
-rw-r--r-- | webkit/glue/resources/webkit_resources.grd | 1 | ||||
-rw-r--r-- | webkit/glue/webkitplatformsupport_impl.cc | 2 |
6 files changed, 8 insertions, 0 deletions
diff --git a/chrome/renderer/autofill/password_generation_manager.cc b/chrome/renderer/autofill/password_generation_manager.cc index ac6202e..3e0b525 100644 --- a/chrome/renderer/autofill/password_generation_manager.cc +++ b/chrome/renderer/autofill/password_generation_manager.cc @@ -174,6 +174,10 @@ WebKit::WebCString PasswordGenerationManager::imageNameForReadOnlyState() { return imageNameForNormalState(); } +WebKit::WebCString PasswordGenerationManager::imageNameForHoverState() { + return WebKit::WebCString("generatePasswordHover"); +} + void PasswordGenerationManager::handleClick(WebKit::WebInputElement& element) { gfx::Rect rect(element.decorationElementFor(this).boundsInViewportSpace()); scoped_ptr<content::PasswordForm> password_form( diff --git a/chrome/renderer/autofill/password_generation_manager.h b/chrome/renderer/autofill/password_generation_manager.h index cd930d9..4dc0738 100644 --- a/chrome/renderer/autofill/password_generation_manager.h +++ b/chrome/renderer/autofill/password_generation_manager.h @@ -54,6 +54,7 @@ class PasswordGenerationManager : public content::RenderViewObserver, virtual WebKit::WebCString imageNameForNormalState() OVERRIDE; virtual WebKit::WebCString imageNameForDisabledState() OVERRIDE; virtual WebKit::WebCString imageNameForReadOnlyState() OVERRIDE; + virtual WebKit::WebCString imageNameForHoverState() OVERRIDE; virtual void handleClick(WebKit::WebInputElement& element) OVERRIDE; virtual void willDetach(const WebKit::WebInputElement& element) OVERRIDE; diff --git a/webkit/glue/resources/default_100_percent/password_generation.png b/webkit/glue/resources/default_100_percent/password_generation.png Binary files differindex 1895dac..c26dcf8 100644 --- a/webkit/glue/resources/default_100_percent/password_generation.png +++ b/webkit/glue/resources/default_100_percent/password_generation.png diff --git a/webkit/glue/resources/default_100_percent/password_generation_hover.png b/webkit/glue/resources/default_100_percent/password_generation_hover.png Binary files differnew file mode 100644 index 0000000..9e4d35e --- /dev/null +++ b/webkit/glue/resources/default_100_percent/password_generation_hover.png diff --git a/webkit/glue/resources/webkit_resources.grd b/webkit/glue/resources/webkit_resources.grd index 523ec65..16d8924 100644 --- a/webkit/glue/resources/webkit_resources.grd +++ b/webkit/glue/resources/webkit_resources.grd @@ -149,6 +149,7 @@ <structure type="chrome_scaled_image" name="IDR_PDF_PAGE_INDICATOR_BACKGROUND" file="pdf_page_indicator_background.png" /> <structure type="chrome_scaled_image" name="IDR_PDF_PAGE_DROPSHADOW" file="pdf_dropshadow.png" /> <structure type="chrome_scaled_image" name="IDR_PASSWORD_GENERATION_ICON" file="password_generation.png" /> + <structure type="chrome_scaled_image" name="IDR_PASSWORD_GENERATION_ICON_HOVER" file="password_generation_hover.png" /> </structures> </release> </grit> diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index 7f91e92..6089dd1 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -543,6 +543,8 @@ const DataResource kDataResources[] = { { "soloCC", IDR_AUTOFILL_CC_SOLO, ui::SCALE_FACTOR_100P }, { "visaCC", IDR_AUTOFILL_CC_VISA, ui::SCALE_FACTOR_100P }, { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, + { "generatePasswordHover", + IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P }, }; } // namespace |