diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 17:24:48 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 17:24:48 +0000 |
| commit | e117ef215378e5ff9a3a3cddbe8f4cdb51e648b3 (patch) | |
| tree | 55c12355d7ea128df045a5b0f0ce756c1e0f032a /chrome/browser/browser_resources.grd | |
| parent | 122c2543a156fa2310ecd5f8825ca9b8d0abcdd9 (diff) | |
| download | chromium_src-e117ef215378e5ff9a3a3cddbe8f4cdb51e648b3.zip chromium_src-e117ef215378e5ff9a3a3cddbe8f4cdb51e648b3.tar.gz chromium_src-e117ef215378e5ff9a3a3cddbe8f4cdb51e648b3.tar.bz2 | |
[Mac] Finish up extension infobar UI implementation.
o One issue under consideration is whether the HTML content of the infobar can take up the entire width. Right now on Windows it does not but with this implementation (and on Linux) it does.
BUG=43168
TEST=ExtensionApiTest.Infobars
Review URL: http://codereview.chromium.org/2973003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 1b2f708..920e23f 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -33,7 +33,12 @@ without changes to the corresponding grd file. eadee --> <include name="IDR_DOM_UI2_CSS" file="resources\dom_ui2.css" flattenhtml="true" type="BINDATA" /> <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_EXTENSION_DEFAULT_ICON" file="resources\extension_default_icon.png" type="BINDATA" /> - <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_infobar.css" flattenhtml="true" type="BINDATA" /> + <if expr="os == 'darwin'"> + <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_infobar_mac.css" flattenhtml="true" type="BINDATA" /> + </if> + <if expr="os != 'darwin'"> + <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_infobar.css" flattenhtml="true" type="BINDATA" /> + </if> <include name="IDR_EXTENSIONS_TOOLSTRIP_THEME_CSS" file="resources\extensions_toolstrip.css" flattenhtml="true" type="BINDATA" /> <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> |