Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/theme/theme_resources.grd

Issue 152143009: Clarify settings UI in multi-profiles mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/app/chromeos_strings.grdp ('K') | « chrome/app/theme/default_200_percent/common/secondary_user_settings.png ('k') | chrome/browser/resources/options/browser_options.html » ('j') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/theme/theme_resources.grd
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index f1485cb264fa3e6cf4e5fb363c96b3069bba5cda..0335a30d5b1c5b98d8933706db5dcaae5b545cf0 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -152,6 +152,10 @@
<structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_corner_mask.png" />
<structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSION" file="common/controlled_setting_extension.png" />
<structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATORY" file="common/controlled_setting_mandatory.png" />
+ <if expr="pp_ifdef('chromeos')">
+ <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_OWNER" file="common/controlled_setting_owner.png" />
oshima 2014/02/07 00:55:12 if this is for chromeos only, the png file should
michaelpg 2014/02/07 02:04:27 Done (actually this one should be common, but cont
+ <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_SHARED" file="common/controlled_setting_shared.png" />
+ </if>
<structure type="chrome_scaled_image" name="IDR_COOKIE_ICON" file="cookie.png" />
<structure type="chrome_scaled_image" name="IDR_COOKIE_STORAGE_ICON" file="cookie_storage.png" />
<structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT" file="common/credit_card_cvc_hint.png" />
@@ -830,6 +834,9 @@
<structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" file="safebrowsing_warning.png" />
<structure type="chrome_scaled_image" name="IDR_SCREEN_CAPTURE_NOTIFICATION_GRIP" file="screen_capture_notification_grip.png" />
<structure type="chrome_scaled_image" name="IDR_SCREENSHOT_NOTIFICATION_ICON" file="common/notification_screenshot_icon.png" />
+ <if expr="pp_ifdef('chromeos')">
+ <structure type="chrome_scaled_image" name="IDR_SECONDARY_USER_SETTINGS" file="common/secondary_user_settings.png" />
oshima 2014/02/07 00:55:12 ditto
michaelpg 2014/02/07 02:04:27 Done.
+ </if>
<if expr="pp_ifdef('enable_settings_app')">
<structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_128" file="settings_app_icon_128.png" />
<structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_16" file="settings_app_icon_16.png" />
« chrome/app/chromeos_strings.grdp ('K') | « chrome/app/theme/default_200_percent/common/secondary_user_settings.png ('k') | chrome/browser/resources/options/browser_options.html » ('j') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698