diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 22:18:48 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 22:18:48 +0000 |
| commit | c5dd54b0b5960408f334c540914c138f1a8a7e57 (patch) | |
| tree | d3b277eb1104a4fae89b2991714f218e101f6d9f /chrome/app/theme/theme_resources.grd | |
| parent | a89cb41eabfd554da054483fd3f7acd70b8c41e1 (diff) | |
| download | chromium_src-c5dd54b0b5960408f334c540914c138f1a8a7e57.zip chromium_src-c5dd54b0b5960408f334c540914c138f1a8a7e57.tar.gz chromium_src-c5dd54b0b5960408f334c540914c138f1a8a7e57.tar.bz2 | |
linux_aura: Compile ash into chrome.
Running chrome with the "--open-ash" parameter will create an ash
desktop window. Ash on Linux has some problems, but at least we're now
compiling the code into the binary.
TODO: The applist isn't positioned correctly, and some details of the
system tray aren't correct.
BUG=300084, 303862
R=sky@chromium.org
Review URL: https://codereview.chromium.org/25108005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme/theme_resources.grd')
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index cb0e1ef..088f3fca 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -164,8 +164,8 @@ </if> <if expr="use_ash"> <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="common/ash/content_top_center.png" /> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_WIN" file="content_top_center.png" /> + <if expr="not chromeos"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_DESKTOP" file="content_top_center.png" /> </if> </if> <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" /> @@ -661,8 +661,8 @@ </if> <if expr="use_ash"> <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common/ash/otr_icon.png" /> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_OTR_ICON_WIN" file="common/otr_icon.png" /> + <if expr="not chromeos"> + <structure type="chrome_scaled_image" name="IDR_OTR_ICON_DESKTOP" file="common/otr_icon.png" /> </if> </if> </if> @@ -1188,11 +1188,11 @@ <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="common/ash/theme_frame_inactive.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="common/ash/theme_frame_incognito_active.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="common/ash/theme_frame_incognito_inactive.png" /> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_WIN" file="theme_frame.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_WIN" file="theme_frame_inactive.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_WIN" file="theme_frame_incognito.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE_WIN" file="theme_frame_incognito_inactive.png" /> + <if expr="not chromeos"> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_DESKTOP" file="theme_frame.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_DESKTOP" file="theme_frame_inactive.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_DESKTOP" file="theme_frame_incognito.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP" file="theme_frame_incognito_inactive.png" /> </if> </if> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file="notused.png" /> @@ -1207,9 +1207,9 @@ <!-- Ash has gray tab backgrounds, Windows uses blue. --> <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="common/ash/theme_default_inactive.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="common/ash/theme_default_inactive.png" /> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_WIN" file="theme_tab_background.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO_WIN" file="theme_tab_background_incognito.png" /> + <if expr="not chromeos"> + <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_DESKTOP" file="theme_tab_background.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP" file="theme_tab_background_incognito.png" /> </if> </if> <if expr="is_macosx or is_ios"> @@ -1223,8 +1223,8 @@ <if expr="use_ash"> <!-- Ash has a dark gray toolbar background, Windows has light gray. --> <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="common/ash/theme_default_active.png" /> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_WIN" file="theme_toolbar_default.png" /> + <if expr="not chromeos"> + <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_DESKTOP" file="theme_toolbar_default.png" /> </if> </if> <if expr="is_macosx or is_ios"> |