summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authornkostylev@google.com <nkostylev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-25 13:50:44 +0000
committernkostylev@google.com <nkostylev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-25 13:50:44 +0000
commita697dcc6b45d4831d3fd53afe8f6463461b3ed0f (patch)
tree4d996fdc93dd7b791ddfcf72b3ac66f2761bb8d1 /chrome/app
parent79ea90be68675c0366173334b269f15f156e2dbf (diff)
downloadchromium_src-a697dcc6b45d4831d3fd53afe8f6463461b3ed0f.zip
chromium_src-a697dcc6b45d4831d3fd53afe8f6463461b3ed0f.tar.gz
chromium_src-a697dcc6b45d4831d3fd53afe8f6463461b3ed0f.tar.bz2
Update welcome screen based on mocks.
- Wizard is proceed to the next screen once "Continue" button is clicked and selected network is connected. - Preselect Ethernet if it's connected. - Clear selection when encrypted network dialog has been cancelled. - Ask for network selection when connection timed out. - Support list of connected/connecting networks. BUG=cros:3279, cros:3306 TEST=Welcome screen & network selection should work. Review URL: http://codereview.chromium.org/2077019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1f573a6..98fb000 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7307,6 +7307,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_NETWORK_SELECTION_OFFLINE_BUTTON" desc="Text shown on work offline button">
Work offline
</message>
+ <message name="IDS_NETWORK_SELECTION_CONTINUE_BUTTON" desc="Text shown on continue button">
+ Continue >>
+ </message>
<message name="IDS_LOGIN_TITLE">
Sign in with your Google account
</message>