diff options
Diffstat (limited to 'chromium/chrome/app/theme')
12 files changed, 4 insertions, 2 deletions
diff --git a/chromium/chrome/app/theme/default_100_percent/chromium/product_logo_name_22.png b/chromium/chrome/app/theme/default_100_percent/chromium/product_logo_name_22.png Binary files differindex 3fdce16787d..addde0e3740 100644 --- a/chromium/chrome/app/theme/default_100_percent/chromium/product_logo_name_22.png +++ b/chromium/chrome/app/theme/default_100_percent/chromium/product_logo_name_22.png diff --git a/chromium/chrome/app/theme/default_100_percent/chromium/product_logo_name_22_white.png b/chromium/chrome/app/theme/default_100_percent/chromium/product_logo_name_22_white.png Binary files differnew file mode 100644 index 00000000000..0cf6cfc1d5a --- /dev/null +++ b/chromium/chrome/app/theme/default_100_percent/chromium/product_logo_name_22_white.png diff --git a/chromium/chrome/app/theme/default_100_percent/common/hide_password_hover.png b/chromium/chrome/app/theme/default_100_percent/common/hide_password_hover.png Binary files differdeleted file mode 100644 index cb5ccc8c98e..00000000000 --- a/chromium/chrome/app/theme/default_100_percent/common/hide_password_hover.png +++ /dev/null diff --git a/chromium/chrome/app/theme/default_100_percent/common/show_password_hover.png b/chromium/chrome/app/theme/default_100_percent/common/show_password_hover.png Binary files differdeleted file mode 100644 index f9a65b7994c..00000000000 --- a/chromium/chrome/app/theme/default_100_percent/common/show_password_hover.png +++ /dev/null diff --git a/chromium/chrome/app/theme/default_200_percent/chromium/product_logo_name_22.png b/chromium/chrome/app/theme/default_200_percent/chromium/product_logo_name_22.png Binary files differindex 5e026c789f0..a611e83849a 100644 --- a/chromium/chrome/app/theme/default_200_percent/chromium/product_logo_name_22.png +++ b/chromium/chrome/app/theme/default_200_percent/chromium/product_logo_name_22.png diff --git a/chromium/chrome/app/theme/default_200_percent/chromium/product_logo_name_22_white.png b/chromium/chrome/app/theme/default_200_percent/chromium/product_logo_name_22_white.png Binary files differnew file mode 100644 index 00000000000..926247cb9f8 --- /dev/null +++ b/chromium/chrome/app/theme/default_200_percent/chromium/product_logo_name_22_white.png diff --git a/chromium/chrome/app/theme/default_200_percent/common/hide_password_hover.png b/chromium/chrome/app/theme/default_200_percent/common/hide_password_hover.png Binary files differdeleted file mode 100644 index b190edf79d3..00000000000 --- a/chromium/chrome/app/theme/default_200_percent/common/hide_password_hover.png +++ /dev/null diff --git a/chromium/chrome/app/theme/default_200_percent/common/show_password_hover.png b/chromium/chrome/app/theme/default_200_percent/common/show_password_hover.png Binary files differdeleted file mode 100644 index aa0093b8f3a..00000000000 --- a/chromium/chrome/app/theme/default_200_percent/common/show_password_hover.png +++ /dev/null diff --git a/chromium/chrome/app/theme/plugin_vm/logo_plugin_vm_default_192.png b/chromium/chrome/app/theme/plugin_vm/logo_plugin_vm_default_192.png Binary files differindex bfb2efef8fe..0a51cb93c39 100644 --- a/chromium/chrome/app/theme/plugin_vm/logo_plugin_vm_default_192.png +++ b/chromium/chrome/app/theme/plugin_vm/logo_plugin_vm_default_192.png diff --git a/chromium/chrome/app/theme/plugin_vm/logo_plugin_vm_default_32.png b/chromium/chrome/app/theme/plugin_vm/logo_plugin_vm_default_32.png Binary files differindex 2cf9ff8ddc4..9f8f67464c8 100644 --- a/chromium/chrome/app/theme/plugin_vm/logo_plugin_vm_default_32.png +++ b/chromium/chrome/app/theme/plugin_vm/logo_plugin_vm_default_32.png diff --git a/chromium/chrome/app/theme/plugin_vm/plugin_vm_installer.png b/chromium/chrome/app/theme/plugin_vm/plugin_vm_installer.png Binary files differindex 7e561aa4571..96a04607332 100644 --- a/chromium/chrome/app/theme/plugin_vm/plugin_vm_installer.png +++ b/chromium/chrome/app/theme/plugin_vm/plugin_vm_installer.png diff --git a/chromium/chrome/app/theme/theme_resources.grd b/chromium/chrome/app/theme/theme_resources.grd index 6e1f0e4f866..ffe5c58d005 100644 --- a/chromium/chrome/app/theme/theme_resources.grd +++ b/chromium/chrome/app/theme/theme_resources.grd @@ -133,7 +133,6 @@ </if> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_HELP_MENU" file="common/help_16.png" /> - <structure type="chrome_scaled_image" name="IDR_HIDE_PASSWORD_HOVER" file="common/hide_password_hover.png" /> <if expr="not chromeos"> <!-- User Manager tutorial --> <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORIAL_YOUR_CHROME" file="common/user_manager_tutorial/your_chrome.png" /> @@ -169,6 +168,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" /> </if> <if expr="_google_chrome"> <if expr="not is_android"> @@ -180,6 +180,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" /> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="google_chrome/product_logo_name_22_white.png" /> </if> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE" file="google_chrome/product_logo_enterprise.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE_WHITE" file="google_chrome/product_logo_enterprise_white.png" /> @@ -250,6 +251,8 @@ </if> <if expr="chromeos"> <structure type="chrome_scaled_image" name="IDR_RESET_WARNING" file="cros/reset_warning.png" /> + <structure type="chrome_scaled_image" name="IDR_ENABLE_DEBUGGING_FAILURE" file="cros/enable_debugging_failure.png" /> + <structure type="chrome_scaled_image" name="IDR_ENABLE_DEBUGGING_SUCCESS" file="cros/enable_debugging_success.png" /> </if> <structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file="common/restore_button_mask.png" /> <if expr="not is_android"> @@ -266,7 +269,6 @@ </if> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_SETTINGS_FAVICON" file="common/favicon_settings.png" /> - <structure type="chrome_scaled_image" name="IDR_SHOW_PASSWORD_HOVER" file="common/show_password_hover.png" /> </if> <if expr="chromeos"> <structure type="chrome_scaled_image" name="IDR_SMB_ICON" file="cros/smb_icon.png" /> |