diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 20:59:27 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 20:59:27 +0000 |
| commit | 9fdff480c99405601b20f4b23a9a64fc711ce9a7 (patch) | |
| tree | 61fde4f652e11ab26071767fc08a88805dc3cbfb /chrome/app | |
| parent | b92e05de97b1dd960974c78be4f392142871df3d (diff) | |
| download | chromium_src-9fdff480c99405601b20f4b23a9a64fc711ce9a7.zip chromium_src-9fdff480c99405601b20f4b23a9a64fc711ce9a7.tar.gz chromium_src-9fdff480c99405601b20f4b23a9a64fc711ce9a7.tar.bz2 | |
Revert 42665 - broke build as I missed a unit test when building locally.
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
TBR=joth@chromium.org
Review URL: http://codereview.chromium.org/1367002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index da49a1a..a7520a8 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -331,8 +331,6 @@ <!-- 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" /> |