diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-20 13:40:20 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-22 12:41:23 +0000 |
commit | 7961cea6d1041e3e454dae6a1da660b453efd238 (patch) | |
tree | c0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/chrome/app/theme | |
parent | b7034d0803538058e5c9d904ef03cf5eab34f6ef (diff) |
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/app/theme')
14 files changed, 14 insertions, 5 deletions
diff --git a/chromium/chrome/app/theme/default_100_percent/common/captions-preview-bg.png b/chromium/chrome/app/theme/default_100_percent/common/captions-preview-bg.png Binary files differnew file mode 100644 index 00000000000..3b2fe7ba095 --- /dev/null +++ b/chromium/chrome/app/theme/default_100_percent/common/captions-preview-bg.png diff --git a/chromium/chrome/app/theme/default_100_percent/common/click_to_call_illustration_dark.png b/chromium/chrome/app/theme/default_100_percent/common/click_to_call_illustration_dark.png Binary files differnew file mode 100644 index 00000000000..a4b4a3d5e8c --- /dev/null +++ b/chromium/chrome/app/theme/default_100_percent/common/click_to_call_illustration_dark.png diff --git a/chromium/chrome/app/theme/default_100_percent/common/click_to_call_illustration_light.png b/chromium/chrome/app/theme/default_100_percent/common/click_to_call_illustration_light.png Binary files differnew file mode 100644 index 00000000000..940ac6c112c --- /dev/null +++ b/chromium/chrome/app/theme/default_100_percent/common/click_to_call_illustration_light.png diff --git a/chromium/chrome/app/theme/default_100_percent/common/cookie_blocking_inactive_header.png b/chromium/chrome/app/theme/default_100_percent/common/cookie_blocking_inactive_header.png Binary files differnew file mode 100644 index 00000000000..103fa73da2b --- /dev/null +++ b/chromium/chrome/app/theme/default_100_percent/common/cookie_blocking_inactive_header.png diff --git a/chromium/chrome/app/theme/default_100_percent/common/cookie_blocking_off_header.png b/chromium/chrome/app/theme/default_100_percent/common/cookie_blocking_off_header.png Binary files differnew file mode 100644 index 00000000000..4926a7a8a1d --- /dev/null +++ b/chromium/chrome/app/theme/default_100_percent/common/cookie_blocking_off_header.png diff --git a/chromium/chrome/app/theme/default_100_percent/common/cookie_blocking_on_header.png b/chromium/chrome/app/theme/default_100_percent/common/cookie_blocking_on_header.png Binary files differnew file mode 100644 index 00000000000..266f21032bc --- /dev/null +++ b/chromium/chrome/app/theme/default_100_percent/common/cookie_blocking_on_header.png diff --git a/chromium/chrome/app/theme/default_100_percent/common/sharing_empty_list.png b/chromium/chrome/app/theme/default_100_percent/common/sharing_empty_list.png Binary files differdeleted file mode 100644 index f1c3efe93aa..00000000000 --- a/chromium/chrome/app/theme/default_100_percent/common/sharing_empty_list.png +++ /dev/null diff --git a/chromium/chrome/app/theme/default_100_percent/common/user_manager_tutorial/translate_bubble_icon.png b/chromium/chrome/app/theme/default_100_percent/common/translate_bubble_icon.png Binary files differindex 33f2e222ea7..33f2e222ea7 100644 --- a/chromium/chrome/app/theme/default_100_percent/common/user_manager_tutorial/translate_bubble_icon.png +++ b/chromium/chrome/app/theme/default_100_percent/common/translate_bubble_icon.png diff --git a/chromium/chrome/app/theme/default_200_percent/common/click_to_call_illustration_dark.png b/chromium/chrome/app/theme/default_200_percent/common/click_to_call_illustration_dark.png Binary files differnew file mode 100644 index 00000000000..ea0e0b4d899 --- /dev/null +++ b/chromium/chrome/app/theme/default_200_percent/common/click_to_call_illustration_dark.png diff --git a/chromium/chrome/app/theme/default_200_percent/common/click_to_call_illustration_light.png b/chromium/chrome/app/theme/default_200_percent/common/click_to_call_illustration_light.png Binary files differnew file mode 100644 index 00000000000..9b56831d02c --- /dev/null +++ b/chromium/chrome/app/theme/default_200_percent/common/click_to_call_illustration_light.png diff --git a/chromium/chrome/app/theme/default_200_percent/common/sharing_empty_list.png b/chromium/chrome/app/theme/default_200_percent/common/sharing_empty_list.png Binary files differdeleted file mode 100644 index cf18daea401..00000000000 --- a/chromium/chrome/app/theme/default_200_percent/common/sharing_empty_list.png +++ /dev/null diff --git a/chromium/chrome/app/theme/default_200_percent/common/translate_bubble_icon.png b/chromium/chrome/app/theme/default_200_percent/common/translate_bubble_icon.png Binary files differindex 920c0639008..40b08fc8da6 100644 --- a/chromium/chrome/app/theme/default_200_percent/common/translate_bubble_icon.png +++ b/chromium/chrome/app/theme/default_200_percent/common/translate_bubble_icon.png diff --git a/chromium/chrome/app/theme/default_200_percent/common/user_manager_tutorial/translate_bubble_icon.png b/chromium/chrome/app/theme/default_200_percent/common/user_manager_tutorial/translate_bubble_icon.png Binary files differdeleted file mode 100644 index 40b08fc8da6..00000000000 --- a/chromium/chrome/app/theme/default_200_percent/common/user_manager_tutorial/translate_bubble_icon.png +++ /dev/null diff --git a/chromium/chrome/app/theme/theme_resources.grd b/chromium/chrome/app/theme/theme_resources.grd index 8ed51ef2804..f294003e44c 100644 --- a/chromium/chrome/app/theme/theme_resources.grd +++ b/chromium/chrome/app/theme/theme_resources.grd @@ -25,6 +25,9 @@ <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE SAME CONDITIONALS. --> + <if expr="is_linux or is_win or chromeos"> + <structure type="chrome_scaled_image" name="IDR_ACCESSIBILITY_CAPTIONS_PREVIEW_BACKGROUND" file="common/captions-preview-bg.png" /> + </if> <if expr="toolkit_views and not is_macosx"> <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE" file="common/app_window_close.png" /> <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_H" file="common/app_window_close_hover.png" /> @@ -76,6 +79,8 @@ <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_PHOTO" file="cros/take_photo.png" /> </if> <if expr="not is_android"> + <structure type="chrome_scaled_image" name="IDR_CLICK_TO_CALL_ILLUSTRATION_LIGHT" file="common/click_to_call_illustration_light.png" /> + <structure type="chrome_scaled_image" name="IDR_CLICK_TO_CALL_ILLUSTRATION_DARK" file="common/click_to_call_illustration_dark.png" /> <!-- Note: Tab close buttons are not traditional buttons. Tab close buttons fill a background with a color from the theme and tile IDR_CLOSE_1 over it. See chrome/browser/ui/views/tabs/tab.cc --> @@ -114,7 +119,6 @@ <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_GENERIC" file="cros/file_types/thumbnails/generic.png" /> <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_VIDEO" file="cros/file_types/thumbnails/video.png" /> </if> - <if expr="chromeos"> <if expr="_google_chrome"> <structure type="chrome_scaled_image" name="IDR_FIRST_RUN_GREETING" file="google_chrome/cros/first_run_greeting.png" /> @@ -180,6 +184,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.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" /> </if> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="common/profile_avatar_generic.png" /> @@ -255,7 +260,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_SHARING_EMPTY_LIST" file="common/sharing_empty_list.png" /> <structure type="chrome_scaled_image" name="IDR_SHOW_PASSWORD_HOVER" file="common/show_password_hover.png" /> </if> <if expr="chromeos"> @@ -276,6 +280,11 @@ <if expr="chromeos"> <structure type="chrome_scaled_image" name="IDR_TAB_RECORDING_INDICATOR" file="cros/tab_recording_indicator.png" /> </if> + <if expr="not is_android"> + <structure type="chrome_scaled_image" name="IDR_COOKIE_BLOCKING_ON_HEADER" file="common/cookie_blocking_on_header.png" /> + <structure type="chrome_scaled_image" name="IDR_COOKIE_BLOCKING_INACTIVE_HEADER" file="common/cookie_blocking_inactive_header.png" /> + <structure type="chrome_scaled_image" name="IDR_COOKIE_BLOCKING_OFF_HEADER" file="common/cookie_blocking_off_header.png" /> + </if> <structure type="chrome_scaled_image" name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" /> <structure type="chrome_scaled_image" name="IDR_TAB_DROP_UP" file="tab_drop_up.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_BUTTON_BACKGROUND" file="notused.png" /> @@ -310,9 +319,7 @@ </if> <!-- Instant Extended API toolbar background is common for all platforms. --> <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="notused.png" /> - <if expr="not is_android"> - <structure type="chrome_scaled_image" name="IDR_TRANSLATE_BUBBLE_ICON" file="common/user_manager_tutorial/translate_bubble_icon.png" /> - </if> + <structure type="chrome_scaled_image" name="IDR_TRANSLATE_BUBBLE_ICON" file="common/translate_bubble_icon.png" /> <if expr="not _google_chrome"> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON" file="chromium/webstore_icon.png" /> @@ -327,6 +334,8 @@ <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="google_chrome/webstore_icon_16.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="google_chrome/webstore_icon_24.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="google_chrome/webstore_icon_32.png" /> + <structure type="chrome_scaled_image" name="IDR_TRANSLATE_TAB_WORDMARK" file="google_chrome/translate_tab_wordmark.png" /> + <structure type="chrome_scaled_image" name="IDR_TRANSLATE_BUTTON_WORDMARK" file="google_chrome/translate_button_wordmark.png" /> </if> </if> </structures> |