Commit 41c8cdf3 authored by akuegel@chromium.org's avatar akuegel@chromium.org

Add theme tab background images.

This CL adds tab background images for the managed user
theme. The bug description shows a screenshot.

BUG=241377

Review URL: https://chromiumcodereview.appspot.com/17542002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208057 0039d316-1c4b-4281-b951-d872f2087c98
parent e630ba64
......@@ -453,6 +453,9 @@
<structure type="chrome_scaled_image" name="IDR_MANAGED_MODE_ICON" file="cros/managed_mode_icon.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_MANAGED_USER_ICON" file="common/limited_user.png" />
<structure type="chrome_scaled_image" name="IDR_MANAGED_USER_THEME_FRAME" file="common/managed_user_theme/theme_frame_supervised.png" />
<structure type="chrome_scaled_image" name="IDR_MANAGED_USER_THEME_FRAME_INACTIVE" file="common/managed_user_theme/theme_frame_supervised_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_MANAGED_USER_THEME_TAB_BACKGROUND" file="common/managed_user_theme/theme_tab_background_supervised.png" />
<structure type="chrome_scaled_image" name="IDR_MAXIMIZE_BUTTON_MASK" file="maximize_button_mask.png" />
<structure type="chrome_scaled_image" name="IDR_MINIMIZE_BUTTON_MASK" file="minimize_button_mask.png" />
<if expr="pp_ifdef('chromeos')">
......@@ -829,8 +832,6 @@
<structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE_WIN" file="theme_frame_incognito_inactive.png" />
</if>
</if>
<structure type="chrome_scaled_image" name="IDR_MANAGED_USER_THEME_FRAME" file="common/managed_user_theme/theme_frame_supervised.png" />
<structure type="chrome_scaled_image" name="IDR_MANAGED_USER_THEME_FRAME_INACTIVE" file="common/managed_user_theme/theme_frame_supervised_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file="notused.png" />
<structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTIVE" file="notused.png" />
<structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" file="notused.png" />
......
......@@ -115,6 +115,8 @@ gfx::Image ThemeService::GetImageNamed(int id) const {
id = IDR_MANAGED_USER_THEME_FRAME;
else if (id == IDR_THEME_FRAME_INACTIVE)
id = IDR_MANAGED_USER_THEME_FRAME_INACTIVE;
else if (id == IDR_THEME_TAB_BACKGROUND || id == IDR_THEME_TAB_BACKGROUND_V)
id = IDR_MANAGED_USER_THEME_TAB_BACKGROUND;
}
gfx::Image image;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment