diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 17:53:36 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 17:53:36 +0000 |
| commit | 534548758f46fe5ce1147282318381eaa504c81b (patch) | |
| tree | 183a9d075e94a74b699665e1c29fdfd95439c174 /chrome/app/google_chrome_strings.grd | |
| parent | 998952e8eb4286ab497d1446527ae618bb0d20c8 (diff) | |
| download | chromium_src-534548758f46fe5ce1147282318381eaa504c81b.zip chromium_src-534548758f46fe5ce1147282318381eaa504c81b.tar.gz chromium_src-534548758f46fe5ce1147282318381eaa504c81b.tar.bz2 | |
Revert 181499 - Allow Terms of Service to be specified for Public Accounts
This CL allows Terms of Service to be specified for a Public Account. The
terms are set by specifying a URL through policy. Chrome downloads the
terms and presents them to the user. Only if the user accepts the terms
can the Public Account be entered.
This CL also fixes the regression described in issue 174314.
TEST=Manual
BUG=chromium-os:32780,174314
Review URL: https://codereview.chromium.org/12218014
TBR=bartfab@chromium.org
Review URL: https://codereview.chromium.org/12213087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/google_chrome_strings.grd')
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index ae3b2ef..5f8dee1 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -883,7 +883,7 @@ For Google Chrome, processes used to display diagnostics information (such as th <message name="IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU" desc="The text in the keyboard overlay to explain the shortcut that opens the main Chrome menu."> Show the Chrome menu </message> - </if> + </if> <!-- App list --> <message name="IDS_APP_LIST_SHORTCUT_NAME" desc="Name for the Chrome App List to appear in the taskbar and in any shortcuts to it."> @@ -898,13 +898,6 @@ For Google Chrome, processes used to display diagnostics information (such as th <message name="IDS_APP_LIST_SIGNIN_TEXT" desc="Text for when the launcher needs to sign in."> You need to be signed into Chrome to use apps. This allows Chrome to sync your apps, bookmarks, history, passwords and other settings across devices. </message> - - <!-- Chrome OS OOBE Terms of Service screen--> - <if expr="pp_ifdef('chromeos')"> - <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen."> - <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read and accept the following Terms of Service before using this device. These terms do not expand, modify or limit the Google Chrome OS Terms. - </message> - </if> </messages> </release> </grit> |