diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-18 21:37:26 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-18 21:37:26 +0000 |
| commit | 1c11cbc44eefc28ebdb15c86d8f67cd04f704a9f (patch) | |
| tree | 14f20d4b14263d950be6242740703b7740e13ac0 | |
| parent | 7d74a74d4395334479365e258b9307bb8e65910c (diff) | |
| download | chromium_src-1c11cbc44eefc28ebdb15c86d8f67cd04f704a9f.zip chromium_src-1c11cbc44eefc28ebdb15c86d8f67cd04f704a9f.tar.gz chromium_src-1c11cbc44eefc28ebdb15c86d8f67cd04f704a9f.tar.bz2 | |
Revert 194966 "Revert 194964 "Added images for disabled print bu..."
> Revert 194964 "Added images for disabled print button for PDF pl..."
>
> > Added images for disabled print button for PDF plugin.
> > BUG=224623
> > Review URL: https://codereview.chromium.org/14113021
>
> TBR=vitalybuka@chromium.org
> Review URL: https://codereview.chromium.org/14301013
TBR=vitalybuka@chromium.org
Review URL: https://codereview.chromium.org/14040007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195007 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/pepper/pepper_pdf_host.cc | 1 | ||||
| -rw-r--r-- | chrome/renderer/pepper/ppb_pdf_impl.cc | 1 | ||||
| -rw-r--r-- | ppapi/c/private/ppb_pdf.h | 3 | ||||
| -rw-r--r-- | webkit/glue/resources/webkit_resources.grd | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/chrome/renderer/pepper/pepper_pdf_host.cc b/chrome/renderer/pepper/pepper_pdf_host.cc index 8dd96b2..4bacddb 100644 --- a/chrome/renderer/pepper/pepper_pdf_host.cc +++ b/chrome/renderer/pepper/pepper_pdf_host.cc @@ -70,6 +70,7 @@ static const ResourceImageInfo kResourceImageMap[] = { { PP_RESOURCEIMAGE_PDF_BUTTON_PRINT, IDR_PDF_BUTTON_PRINT }, { PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_HOVER, IDR_PDF_BUTTON_PRINT_HOVER }, { PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_PRESSED, IDR_PDF_BUTTON_PRINT_PRESSED }, + { PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_DISABLED, IDR_PDF_BUTTON_PRINT_DISABLED }, { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_0, IDR_PDF_THUMBNAIL_0 }, { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_1, IDR_PDF_THUMBNAIL_1 }, { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_2, IDR_PDF_THUMBNAIL_2 }, diff --git a/chrome/renderer/pepper/ppb_pdf_impl.cc b/chrome/renderer/pepper/ppb_pdf_impl.cc index bdda4ed..6cb3bbe 100644 --- a/chrome/renderer/pepper/ppb_pdf_impl.cc +++ b/chrome/renderer/pepper/ppb_pdf_impl.cc @@ -105,6 +105,7 @@ static const ResourceImageInfo kResourceImageMap[] = { { PP_RESOURCEIMAGE_PDF_BUTTON_PRINT, IDR_PDF_BUTTON_PRINT }, { PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_HOVER, IDR_PDF_BUTTON_PRINT_HOVER }, { PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_PRESSED, IDR_PDF_BUTTON_PRINT_PRESSED }, + { PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_DISABLED, IDR_PDF_BUTTON_PRINT_DISABLED }, { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_0, IDR_PDF_THUMBNAIL_0 }, { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_1, IDR_PDF_THUMBNAIL_1 }, { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_2, IDR_PDF_THUMBNAIL_2 }, diff --git a/ppapi/c/private/ppb_pdf.h b/ppapi/c/private/ppb_pdf.h index 3fb9a4f..2e2e73b 100644 --- a/ppapi/c/private/ppb_pdf.h +++ b/ppapi/c/private/ppb_pdf.h @@ -69,7 +69,8 @@ typedef enum { PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END_HOVER = 41, PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END_PRESSED = 42, PP_RESOURCEIMAGE_PDF_PAN_SCROLL_ICON = 43, - PP_RESOURCEIMAGE_PDF_PAGE_INDICATOR_BACKGROUND = 44 + PP_RESOURCEIMAGE_PDF_PAGE_INDICATOR_BACKGROUND = 44, + PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_DISABLED = 45 } PP_ResourceImage; typedef enum { diff --git a/webkit/glue/resources/webkit_resources.grd b/webkit/glue/resources/webkit_resources.grd index 03cdb57..0c5b933 100644 --- a/webkit/glue/resources/webkit_resources.grd +++ b/webkit/glue/resources/webkit_resources.grd @@ -93,6 +93,7 @@ <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT" file="pdf_button_print.png" /> <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT_HOVER" file="pdf_button_print_hover.png" /> <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT_PRESSED" file="pdf_button_print_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT_DISABLED" file="pdf_button_print_disabled.png" /> <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_0" file="pdf_thumbnail_0.png" /> <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_1" file="pdf_thumbnail_1.png" /> <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_2" file="pdf_thumbnail_2.png" /> |