diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 11:44:41 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 11:44:41 +0000 |
| commit | 29b81fc2fe3be64d9a98fa43da18e5ce86f5896c (patch) | |
| tree | 7c139b5422ea63a48c131d014f9da950bb645fee | |
| parent | 42a553fc962177d260af3561c6d708d30b952d31 (diff) | |
| download | chromium_src-29b81fc2fe3be64d9a98fa43da18e5ce86f5896c.zip chromium_src-29b81fc2fe3be64d9a98fa43da18e5ce86f5896c.tar.gz chromium_src-29b81fc2fe3be64d9a98fa43da18e5ce86f5896c.tar.bz2 | |
Merge 208500 "Add marketing images to supervised user creation d..."
> Add marketing images to supervised user creation dialogs
>
> BUG=179669
> R=ygorshenin@chromium.org
> TBR=oshima@chromium.org
> NOTRY=true
>
> Review URL: https://chromiumcodereview.appspot.com/17699002
TBR=antrim@chromium.org
Review URL: https://codereview.chromium.org/18522002
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@209671 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 4 | ||||
| -rw-r--r-- | chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 34e157e..9ac0e4f 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -759,6 +759,10 @@ <structure type="chrome_scaled_image" name="IDR_STOP_H" file="common/browser_stop_hover.png" /> <structure type="chrome_scaled_image" name="IDR_STOP_P" file="common/browser_stop_pressed.png" /> </if> + <if expr="pp_ifdef('chromeos')"> + <structure type="chrome_scaled_image" name="IDR_SUPERVISED_ILLUSTRATION_START" file="cros/supervised_illustration_start.png" /> + <structure type="chrome_scaled_image" name="IDR_SUPERVISED_ILLUSTRATION_DONE" file="cros/supervised_illsutration_done.png" /> + </if> <if expr="not pp_ifdef('toolkit_views') and not is_macosx"> <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" /> <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" /> diff --git a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html index 96e367d..77d6d61 100644 --- a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html +++ b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html @@ -3,7 +3,7 @@ <div id="managed-user-creation-intro" class="step-no-logo"> <div id="managed-user-creation-marketing-intro" class="marketing"> - Marketing placeholder. + <img src="chrome://theme/IDR_SUPERVISED_ILLUSTRATION_START"> </div> <div class="below-marketing"> <div i18n-content="createManagedUserIntroText1"></div> @@ -88,6 +88,7 @@ </div> <div id="managed-user-creation-created-1" class="step-no-logo" hidden> <div class="marketing"> + <img src="chrome://theme/IDR_SUPERVISED_ILLUSTRATION_DONE"> </div> <div class="below-marketing"> <div> |