summaryrefslogtreecommitdiffstats
path: root/chrome/app/theme
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-25 20:46:02 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-25 20:46:02 +0000
commit1fbdf78da077cf0f8a4f34b3d1753aaa9e511781 (patch)
treedd7d6fa687a0d16537e5bc40629ced34cac1bb01 /chrome/app/theme
parent6d9a36f8262936f7ef730bfdac7a1058aa1d99d6 (diff)
downloadchromium_src-1fbdf78da077cf0f8a4f34b3d1753aaa9e511781.zip
chromium_src-1fbdf78da077cf0f8a4f34b3d1753aaa9e511781.tar.gz
chromium_src-1fbdf78da077cf0f8a4f34b3d1753aaa9e511781.tar.bz2
Adds geolocaiton support to the location bar content image model and content bubble model.
Most of these edits were lifted out of http://codereview.chromium.org/650180 TODO: add geolocation support to the views in the three UI platforms for the bubble model. (NOTE this change results in poorly formed bubble contents for the geolocaiton bubble, this will be fixed up in the following CLs) BUG=11246 TEST=open a site that uses geolocaiton, select allow/deny & click the icon. Review URL: http://codereview.chromium.org/1344002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme')
-rw-r--r--chrome/app/theme/theme_resources.grd2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index a7520a8..da49a1a 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -331,6 +331,8 @@
<!-- Geolocation -->
<include name="IDR_GEOLOCATION_INFOBAR_ICON" file="geolocation_infobar_icon.png" type="BINDATA" />
+ <include name="IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON" file="geolocation_allowed_locationbar_icon.png" type="BINDATA" />
+ <include name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="geolocation_denied_locationbar_icon.png" type="BINDATA" />
<if expr="pp_ifdef('_google_chrome')">
<include name="IDR_ABOUT_BACKGROUND" file="google_chrome/about_background.png" type="BINDATA" />