summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-26 15:38:12 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-26 15:38:12 +0000
commit68ef1a4d7f180cb9a417236eadbdbe4e1124161d (patch)
tree7ad474a68ab3771ab009b5f5b532341a632c4e83 /chrome/app
parent1ba022e96a6d96b22b8a5d19b423c39785641597 (diff)
downloadchromium_src-68ef1a4d7f180cb9a417236eadbdbe4e1124161d.zip
chromium_src-68ef1a4d7f180cb9a417236eadbdbe4e1124161d.tar.gz
chromium_src-68ef1a4d7f180cb9a417236eadbdbe4e1124161d.tar.bz2
Land resources for 3189012: "Go incognito" button in bottom right corner
Original CL: http://codereview.chromium.org/3189012/show Implemented "Go incognito" button that appears in bottom right corner if oobe process is done. Otherwise usual "browse without signin" link appears in the new login entry. BUG=chromium-os:5630 TEST=When login screen is loaded there is button in bottom right corner (if no OOBE status bar). Review URL: http://codereview.chromium.org/3195029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/app/theme/incognito_guy.pngbin0 -> 3799 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd1
3 files changed, 4 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 9b75f49..f7d2e8b 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -8149,6 +8149,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON">
Browse without signing in
</message>
+ <message name="IDS_GO_INCOGNITO_BUTTON">
+ Go incognito
+ </message>
<message name="IDS_LOGIN_OOBE_HELP_DIALOG_TITLE" desc="Default title for help dialogs during OOBE/login">
Help
</message>
diff --git a/chrome/app/theme/incognito_guy.png b/chrome/app/theme/incognito_guy.png
new file mode 100644
index 0000000..7630795
--- /dev/null
+++ b/chrome/app/theme/incognito_guy.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 6f5cd27..19737f4 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -465,6 +465,7 @@
<include name="IDR_COMPACTNAV_BACK" file="compactnav_back.png" type="BINDATA" />
<include name="IDR_COMPACTNAV_FORWARD" file="compactnav_forward.png" type="BINDATA" />
<include name="IDR_COMPACTNAV_SEPARATOR" file="compactnav_separator.png" type="BINDATA" />
+ <include name="IDR_INCOGNITO_GUY" file="incognito_guy.png" type="BINDATA" />
<include name="IDR_LOGIN_DEFAULT_USER" file="login_default.png" type="BINDATA" />
<include name="IDR_LOGIN_OTHER_USER" file="login_other.png" type="BINDATA" />
<include name="IDR_NOTIFICATION_LOW_BATTERY" file="notification_battery_low.png" type="BINDATA" />