summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-30 16:21:12 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-30 16:21:12 +0000
commite31b60eda39b566bf68b7218ebbb3f76a8c094aa (patch)
tree474eab3e12ed28546e71972fb0718197eb096296
parent7f1df0926eb0e14fe752d1d67d3f793a43245b54 (diff)
downloadchromium_src-e31b60eda39b566bf68b7218ebbb3f76a8c094aa.zip
chromium_src-e31b60eda39b566bf68b7218ebbb3f76a8c094aa.tar.gz
chromium_src-e31b60eda39b566bf68b7218ebbb3f76a8c094aa.tar.bz2
contacts: Add strings and image theme resources.
This adds tooltip strings for the icons that'll appear within contact results in the app list. I'm also adding the previously-checked-in icon images and the default profile photo to theme_resources.grd. BUG=141877 TEST=none Review URL: https://chromiumcodereview.appspot.com/10899027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154165 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd12
-rw-r--r--chrome/app/theme/theme_resources.grd11
2 files changed, 23 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 380e153..62a1d2e 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -17383,6 +17383,18 @@ Battery full
</message>
<!-- App List. -->
+ <message name="IDS_APP_LIST_CONTACT_CHAT_TOOLTIP" desc="Tooltip text for the 'chat' icon displayed next to a contact search result.">
+ Chat
+ </message>
+ <message name="IDS_APP_LIST_CONTACT_EMAIL_TOOLTIP" desc="Tooltip text for the 'email' icon displayed next to a contact search result.">
+ Send email
+ </message>
+ <message name="IDS_APP_LIST_CONTACT_PHONE_TOOLTIP" desc="Tooltip text for the 'phone' icon displayed next to a contact search result.">
+ Call phone
+ </message>
+ <message name="IDS_APP_LIST_CONTACT_VIDEO_TOOLTIP" desc="Tooltip text for the 'video' icon displayed next to a contact search result.">
+ Start Hangout
+ </message>
<message name="IDS_APP_LIST_CONTEXT_MENU_PIN" desc="Title text for the 'pin' context menu item of an app list item.">
Pin to Launcher
</message>
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index c83fa9e..6844670 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -108,6 +108,17 @@
<structure type="chrome_scaled_image" name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_v.png" />
<structure type="chrome_scaled_image" name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_left_corner_v.png" />
<structure type="chrome_scaled_image" name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_right_corner_v.png" />
+ <if expr="pp_ifdef('chromeos')">
+ <structure type="chrome_scaled_image" name="IDR_CONTACT_ACTION_CHAT" file="contact_action_chat_base.png" />
+ <structure type="chrome_scaled_image" name="IDR_CONTACT_ACTION_CHAT_H" file="contact_action_chat_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_CONTACT_ACTION_EMAIL" file="contact_action_email_base.png" />
+ <structure type="chrome_scaled_image" name="IDR_CONTACT_ACTION_EMAIL_H" file="contact_action_email_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_CONTACT_ACTION_PHONE" file="contact_action_phone_base.png" />
+ <structure type="chrome_scaled_image" name="IDR_CONTACT_ACTION_PHONE_H" file="contact_action_phone_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_CONTACT_ACTION_VIDEO" file="contact_action_video_base.png" />
+ <structure type="chrome_scaled_image" name="IDR_CONTACT_ACTION_VIDEO_H" file="contact_action_video_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_CONTACT_DEFAULT_PHOTO" file="contact_default_photo.png" />
+ </if>
<!-- Ash doesn't draw rounded content area, so needs a special top
image. -->
<if expr="not pp_ifdef('use_ash')">