diff options
author | mgiuca <mgiuca@chromium.org> | 2015-02-18 17:09:25 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-19 01:10:32 +0000 |
commit | 8d50b3ae887a32fa31e18a8669ff2187a41e0b76 (patch) | |
tree | 00018e620d85038536afa3b81cf4bfbf60b94566 | |
parent | 40e4cd8a507016a99740011899ca4b9779cd9eef (diff) | |
download | chromium_src-8d50b3ae887a32fa31e18a8669ff2187a41e0b76.zip chromium_src-8d50b3ae887a32fa31e18a8669ff2187a41e0b76.tar.gz chromium_src-8d50b3ae887a32fa31e18a8669ff2187a41e0b76.tar.bz2 |
Update Chrome Launcher icons with new assets.
The new assets have correct colour contrast and more closely match the
Material Design spec. Affects both the classic and experimental
launcher.
The following assets were replaced:
- Microphone (hotword enabled and disabled states).
- Back button.
- Download progress bar.
BUG=457979,456953
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/931483004
Cr-Commit-Position: refs/heads/master@{#316947}
16 files changed, 2 insertions, 1 deletions
diff --git a/chrome/app/theme/default_100_percent/common/app_list_mic_hotword_off.png b/chrome/app/theme/default_100_percent/common/app_list_mic_hotword_off.png Binary files differindex db78128..9f7db87 100644 --- a/chrome/app/theme/default_100_percent/common/app_list_mic_hotword_off.png +++ b/chrome/app/theme/default_100_percent/common/app_list_mic_hotword_off.png diff --git a/chrome/app/theme/default_100_percent/common/app_list_mic_hotword_on.png b/chrome/app/theme/default_100_percent/common/app_list_mic_hotword_on.png Binary files differnew file mode 100644 index 0000000..ad216da --- /dev/null +++ b/chrome/app/theme/default_100_percent/common/app_list_mic_hotword_on.png diff --git a/chrome/app/theme/default_200_percent/common/app_list_mic_hotword_off.png b/chrome/app/theme/default_200_percent/common/app_list_mic_hotword_off.png Binary files differindex 3282e40..9d82452 100644 --- a/chrome/app/theme/default_200_percent/common/app_list_mic_hotword_off.png +++ b/chrome/app/theme/default_200_percent/common/app_list_mic_hotword_off.png diff --git a/chrome/app/theme/default_200_percent/common/app_list_mic_hotword_on.png b/chrome/app/theme/default_200_percent/common/app_list_mic_hotword_on.png Binary files differnew file mode 100644 index 0000000..2651065 --- /dev/null +++ b/chrome/app/theme/default_200_percent/common/app_list_mic_hotword_on.png diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 742df53..981fed8 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -52,6 +52,7 @@ <if expr="enable_app_list"> <structure type="chrome_scaled_image" name="IDR_APP_LIST_TAB_OVERLAY" file="common/app_list_v1_overlay.png" /> <structure type="chrome_scaled_image" name="IDR_APP_LIST_MIC_HOTWORD_OFF" file="common/app_list_mic_hotword_off.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_LIST_MIC_HOTWORD_ON" file="common/app_list_mic_hotword_on.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" /> diff --git a/chrome/browser/ui/app_list/search/search_resource_manager.cc b/chrome/browser/ui/app_list/search/search_resource_manager.cc index 3f64cb3..9dca6cf 100644 --- a/chrome/browser/ui/app_list/search/search_resource_manager.cc +++ b/chrome/browser/ui/app_list/search/search_resource_manager.cc @@ -24,7 +24,7 @@ scoped_ptr<SearchBoxModel::SpeechButtonProperty> CreateNewProperty( ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); return make_scoped_ptr(new SearchBoxModel::SpeechButtonProperty( - *bundle.GetImageSkiaNamed(IDR_OMNIBOX_MIC_SEARCH), + *bundle.GetImageSkiaNamed(IDR_APP_LIST_MIC_HOTWORD_ON), l10n_util::GetStringUTF16(IDS_APP_LIST_HOTWORD_LISTENING), *bundle.GetImageSkiaNamed(IDR_APP_LIST_MIC_HOTWORD_OFF), l10n_util::GetStringUTF16(IDS_APP_LIST_START_SPEECH_RECOGNITION))); diff --git a/ui/resources/default_100_percent/common/app_list_folder_back_normal.png b/ui/resources/default_100_percent/common/app_list_folder_back_normal.png Binary files differindex 4f748cc..af34624 100644 --- a/ui/resources/default_100_percent/common/app_list_folder_back_normal.png +++ b/ui/resources/default_100_percent/common/app_list_folder_back_normal.png diff --git a/ui/resources/default_100_percent/common/app_list_progress_bar_background.png b/ui/resources/default_100_percent/common/app_list_progress_bar_background.png Binary files differindex 0a285c4..d4b6e41 100644 --- a/ui/resources/default_100_percent/common/app_list_progress_bar_background.png +++ b/ui/resources/default_100_percent/common/app_list_progress_bar_background.png diff --git a/ui/resources/default_100_percent/common/app_list_progress_bar_center.png b/ui/resources/default_100_percent/common/app_list_progress_bar_center.png Binary files differindex dc6e013..b652768 100644 --- a/ui/resources/default_100_percent/common/app_list_progress_bar_center.png +++ b/ui/resources/default_100_percent/common/app_list_progress_bar_center.png diff --git a/ui/resources/default_100_percent/common/app_list_progress_bar_left.png b/ui/resources/default_100_percent/common/app_list_progress_bar_left.png Binary files differindex 50362d4..1669f92 100644 --- a/ui/resources/default_100_percent/common/app_list_progress_bar_left.png +++ b/ui/resources/default_100_percent/common/app_list_progress_bar_left.png diff --git a/ui/resources/default_100_percent/common/app_list_progress_bar_right.png b/ui/resources/default_100_percent/common/app_list_progress_bar_right.png Binary files differindex 25ac77e..23b0905 100644 --- a/ui/resources/default_100_percent/common/app_list_progress_bar_right.png +++ b/ui/resources/default_100_percent/common/app_list_progress_bar_right.png diff --git a/ui/resources/default_200_percent/common/app_list_folder_back_normal.png b/ui/resources/default_200_percent/common/app_list_folder_back_normal.png Binary files differindex 7ad7206..860215e 100644 --- a/ui/resources/default_200_percent/common/app_list_folder_back_normal.png +++ b/ui/resources/default_200_percent/common/app_list_folder_back_normal.png diff --git a/ui/resources/default_200_percent/common/app_list_progress_bar_background.png b/ui/resources/default_200_percent/common/app_list_progress_bar_background.png Binary files differindex 7172e9b..ebe962b 100644 --- a/ui/resources/default_200_percent/common/app_list_progress_bar_background.png +++ b/ui/resources/default_200_percent/common/app_list_progress_bar_background.png diff --git a/ui/resources/default_200_percent/common/app_list_progress_bar_center.png b/ui/resources/default_200_percent/common/app_list_progress_bar_center.png Binary files differindex 2c49c00..421d0c0 100644 --- a/ui/resources/default_200_percent/common/app_list_progress_bar_center.png +++ b/ui/resources/default_200_percent/common/app_list_progress_bar_center.png diff --git a/ui/resources/default_200_percent/common/app_list_progress_bar_left.png b/ui/resources/default_200_percent/common/app_list_progress_bar_left.png Binary files differindex 1e4c82e..cf28951 100644 --- a/ui/resources/default_200_percent/common/app_list_progress_bar_left.png +++ b/ui/resources/default_200_percent/common/app_list_progress_bar_left.png diff --git a/ui/resources/default_200_percent/common/app_list_progress_bar_right.png b/ui/resources/default_200_percent/common/app_list_progress_bar_right.png Binary files differindex 3e0b4b3..a1b7ecf 100644 --- a/ui/resources/default_200_percent/common/app_list_progress_bar_right.png +++ b/ui/resources/default_200_percent/common/app_list_progress_bar_right.png |