diff options
| author | michaelpg@chromium.org <michaelpg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 05:47:00 +0000 |
|---|---|---|
| committer | michaelpg@chromium.org <michaelpg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 05:47:00 +0000 |
| commit | dd0bf461376beee097367a82c78ab70abc41744e (patch) | |
| tree | 70e576cff99599a320c6d087c950a67bc6858d25 /chrome/browser/browser_resources.grd | |
| parent | 3e9fc2f543b884e8cd35417605abf1075205e8e8 (diff) | |
| download | chromium_src-dd0bf461376beee097367a82c78ab70abc41744e.zip chromium_src-dd0bf461376beee097367a82c78ab70abc41744e.tar.gz chromium_src-dd0bf461376beee097367a82c78ab70abc41744e.tar.bz2 | |
Date and Time dialog for when the clock isn't synced.
If the time has not been set automatically via network syncing, the system
clock can be changed. This dialog allows the user to change the date, time
and time zone when possible. The motivation is to unbrick devices with
the wrong time that need to be rolled out into time-sensitive networks.
Documentation of the changes to Chrome OS and Ash for this CL is here:
https://docs.google.com/a/google.com/drawings/d/1T3demthtROnXf1iE31p5aIPcQzK9SmjfE9EjnJbZ4zs
System Time Manual Update UI design doc:
https://docs.google.com/a/google.com/document/d/1djzhBrtbx-52Gctp3Fd5MIosARbTwQh_lMmd_qUnqgo
Screenshot with timezone:
https://drive.google.com/a/google.com/file/d/0B6HSBrih6pNUd3p2SFBoVktjVzQ
Screenshot from settings page, no timezone:
https://drive.google.com/a/google.com/file/d/0B6HSBrih6pNUXzk0TjNiT0tKMTQ
BUG=232066
TEST=SetTimeWebUITest, DateTimeOptionsWebUITest
R=stevenjb@chromium.org,nkostylev@chromium.org,dbeam@chromium.org,derat@chromium.org,asvitkine@chromium.org
TBR=sky@chromium.org
# TBR for adding resources to chrome/browser/chrome_resources.grd
Please review:
stevenjb@chromium.org
- ash/system
- chromeos/dbus
derat@chromium.org:
- chrome/browser/chromeos
- chrome/browser/ui/ash
- chromeos/dbus (optional)
nkostylev@chromium.org:
- chrome/app
- chrome/browser/chromeos
- chrome/browser/resources/chromeos
- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
- chrome/browser/ui/webui/chromeos
- chrome/browser/ui/webui/options/chromeos
- chrome/browser/browser_resources.grd
- chrome/chrome_*.gypi
- chrome/common
dbeam@chromium.org:
- chrome/browser/resources/options
- chrome/browser/ui/webui/options/*.cc
sky@chromium.org:
- chrome/browser/browser_resources.grd
Review URL: https://codereview.chromium.org/247663003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 6d50d5a..24bc6d9 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -409,6 +409,11 @@ <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" type="BINDATA" /> <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" type="BINDATA" /> <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manifest.json" type="BINDATA" /> + <if expr="chromeos"> + <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html" type="BINDATA" /> + <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" /> + <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" type="BINDATA" /> + </if> </includes> </release> </grit> |