Renamed choice.{css,html} to main.{css,html}

Also, fixed mode change bug if daemon is supported.

BUG=None
TEST=I no longer get that "What was I thinking?" feeling when looking at the filename of our landing page.

Review URL: https://chromiumcodereview.appspot.com/9420016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122356 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 417 insertions, 422 deletions

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 6ad01ef..31946c9 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -107,8 +107,6 @@
       'resources/icon_pencil.png',
       'resources/icon_warning.png',
       'webapp/ask_pin_dialog.js',
-      'webapp/choice.css',
-      'webapp/choice.html',
       'webapp/client_plugin.js',
       'webapp/client_plugin_async.js',
       'webapp/client_plugin_v1.js',
@@ -128,6 +126,7 @@
       'webapp/l10n.js',
       'webapp/log_to_server.js',
       'webapp/main.css',
+      'webapp/main.html',
       'webapp/manifest.json',
       'webapp/oauth2.js',
       'webapp/oauth2_callback.html',
@@ -376,7 +375,7 @@
           'inputs': [
             'webapp/verify-webapp.py',
             'webapp/_locales/en/messages.json',
-            'webapp/choice.html',
+            'webapp/main.html',
             'webapp/host_table_entry.js',
             'webapp/manifest.json',
             'webapp/remoting.js',
@@ -390,7 +389,7 @@
             'webapp/verify-webapp.py',
             '<(PRODUCT_DIR)/remoting/webapp_verified.stamp',
             'webapp/_locales/en/messages.json',
-            'webapp/choice.html',
+            'webapp/main.html',
             'webapp/host_table_entry.js',
             'webapp/manifest.json',
             'webapp/remoting.js',
diff --git a/remoting/webapp/choice.css b/remoting/webapp/choice.css
deleted file mode 100644
index 44c225b..0000000
--- a/remoting/webapp/choice.css
+++ /dev/null
@@ -1,409 +0,0 @@
-/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* Elements */
-a {
-  color: rgb(0, 102, 204);
-  text-decoration: none;
-}
-
-body {
-  background: -webkit-gradient(radial, center center, 0, center center, 400,
-                               from(rgb(254, 254, 254)),
-                               to(rgb(239, 239, 239)));
-  font-family: 'Open sans', Arial, sans-serif;
-  margin:0;
-  padding:0;
-  direction: __MSG_@@bidi_dir__;
-}
-
-button, input {
-  font-family: inherit;
-  font-size: inherit;
-}
-
-button {
-  background: -webkit-linear-gradient(#fafafa, #f4f4f4 40%, #e5e5e5);
-  border: 1px solid #aaa;
-  min-width: 72px;
-  -webkit-border-radius: 2px;
-  -webkit-box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1);
-  -webkit-user-select: none;
-}
-
-button:hover {
-  background: #ebebeb -webkit-linear-gradient(#fefefe, #f8f8f8 40%, #e9e9e9);
-  border-color: #999;
-  color: #222;
-  -webkit-box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2);
-}
-
-button:active, .toggle-button-active, .toggle-button-active:hover {
-  background: #ebebeb -webkit-linear-gradient(#f4f4f4, #efefef 40%, #dcdcdc);
-  color: #333;
-  -webkit-box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.2);
-}
-
-button[disabled], .button[disabled]:hover {
-  background: -webkit-linear-gradient(#fafafa, #f4f4f4 40%, #e5e5e5);
-  border-color: #aaa;
-  color: #888;
-  -webkit-box-shadow: none;
-}
-
-h1 {
-  font-size: 24px;
-  font-weight: normal;
-}
-
-html {
-  /*
-    Used to force background gradient to center correctly.
-    http://crbug.com/109705
-  */
-  height: 100%;
-}
-
-label {
-  color: black;
-  font-weight: bold;
-}
-
-/* Classes */
-
-.access-code-digit-group {
-  /*
-    Used for each of the four-digit components of the access code as
-    displayed by the host.
-  */
-  padding: 0px 6px;
-}
-
-.big-button {
-  height: 2em;
-  font-size: 16px;
-  padding: 6px;
-}
-
-.centered-button {
-  /*
-    Used to force buttons to center correctly on Chrome due to a quirk
-    with laying out buttons. http://crbug.com/84654
-
-    TODO(ajwong): Either fix Chrome layout behavior, or if Chrome is actually
-    conforming correctly to the standard, remove this comment.
-  */
-  text-align: center;
-}
-
-.collapsed {
-  opacity: 0;
-  height: 0 !important;
-}
-
-.choice-header {
-  font-size: 24px;
-  font-weight: normal;
-  margin-__MSG_@@bidi_start_edge__: 10px;
-}
-
-.choice-footer {
-  font-size: 14px;
-}
-
-.choice-panel {
-  margin-top: 17px;
-  padding-bottom: 20px;
-}
-
-.clickable {
-  cursor: pointer;
-}
-
-.description {
-  margin-bottom: 25px;
-}
-
-.error-state {
-  background-image: url('icon_warning.png');
-  background-repeat: no-repeat;
-  background-position: top __MSG_@@bidi_start_edge__;
-  padding-__MSG_@@bidi_start_edge__: 30px;
-  padding-top: 3px;
-  margin-bottom: 10px;
-  color: #900;
-  display: inline-block;
-}
-
-.expiring {
-    color: #900 !important;
-}
-
-[hidden] {
-  display: none !important;
-}
-
-
-.icon-label {
-  display: inline-block;
-  vertical-align: top;
-  margin-__MSG_@@bidi_start_edge__: 10px;
-}
-
-.information-box {
-  background-color: #f9edbe;
-  border: 1px solid #f0c36d;
-  -webkit-border-radius: 2px;
-  -webkit-box-shadow: 0px 2px 4px rgba(0,0,0,0.2);
-  color: #222;
-  padding: 8px 16px;
-  text-align: center;
-  font-size: 12px;
-}
-
-.information-box-centerer {
-  width: 100%;
-  bottom: 8px;
-  position: absolute;
-  display: -webkit-box;
-}
-
-.information-box-padding {
-  -webkit-box-flex: 1;
-}
-
-.message {
-  text-align:center;
-  margin-bottom: 10px;
-}
-
-.mode-select-button {
-  width: 100%;
-  height: 32px;
-  white-space: nowrap;
-}
-
-.mode-select-label {
-  padding-__MSG_@@bidi_end_edge__: 20px;
-}
-
-.mode-select-table {
-  margin-__MSG_@@bidi_start_edge__: 40px;
-  width: 600px;  /* width + margin = body width */
-  border-collapse: collapse;
-  margin-top: 40px;
-}
-
-.mode-select-table-spacer {
-  height: 20px;
-}
-
-.mode-select-table-underline td {
-  border-bottom: 1px solid #c6c6c6;
-}
-
-.hide-scrollbars {
-  overflow-y: hidden;
-}
-
-.host-list-container {
-  -webkit-transition: all 0.5s;
-  overflow: hidden;
-}
-
-.host-list-table {
-  margin-__MSG_@@bidi_start_edge__: 30px;
-  width: 610px;  /* width + margin = body width */
-  border-spacing: 0;
-}
-
-.host-list-row {
-  height: 50px;
-  color: black;
-}
-
-.host-list-row td {
-  border-bottom: 1px solid transparent;
-  border-top: 1px solid transparent;
-}
-
-.host-list-row:hover {
-  background-color: #e7eef2;
-}
-
-.host-list-rename-icon, .host-list-remove-icon {
-  opacity: 0;
-}
-
-.host-list-row:hover .host-list-rename-icon {
-  opacity: 0.8;
-}
-
-.host-list-row:hover .host-list-remove-icon {
-  opacity: 0.3;
-}
-
-.host-list-edit:hover .host-list-rename-icon {
-  opacity: 1;
-}
-
-.host-list-edit:hover .host-list-remove-icon {
-  opacity: 0.5;
-}
-
-.host-list-row:hover td {
-  border-bottom: 1px solid #c6c6c6;
-  border-top: 1px solid #c6c6c6;
-}
-
-.host-list-row-end {
-  padding-__MSG_@@bidi_end_edge__: 10px;
-}
-
-.host-list-row-start {
-  padding-__MSG_@@bidi_start_edge__: 10px;
-}
-
-.host-offline {
-  color: #a9a9a9;
-}
-
-.host-offline .host-list-main-icon {
-  opacity: 0.5;
-}
-
-.small-print {
-  font-size: 13px;
-  color: #AAA;
-}
-
-.top-primary {
-  font-size: 14px;
-  position: absolute;
-  top: 0.5em;
-  __MSG_@@bidi_start_edge__: 0.5em;
-}
-
-.top-secondary {
-  font-size: 14px;
-  position: absolute;
-  top: 0.5em;
-  __MSG_@@bidi_end_edge__: 0.5em;
-}
-
-.waiting {
-  color: rgb(180, 180, 180);
-}
-
-/* Ids */
-#access-code-countdown-container {
-  height: 50px;
-  text-align: center;
-}
-
-#access-code-display {
-  margin-top: 50px;
-  color: rgb(0, 0, 0);
-  font-weight: bold;
-  font-size: 26px;
-  text-align: center;
-}
-
-#access-code-entry {
-  font-weight: bold;
-  font-size: 18px;
-  height: 25px;
-  margin: 0 10px;
-  padding-__MSG_@@bidi_start_edge__: 5px;
-  width: 12em;
-}
-
-#access-code-entry-row {
-  text-align: center;
-}
-
-#ask-pin-dialog {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  width: 380px;
-  height: 180px;
-  margin-left: -200px;
-  border: 1px solid black;
-  background-color: #fff;
-  padding: 0 20px;
-}
-
-#cancel-button {
-  float: __MSG_@@bidi_end_edge__;
-}
-
-#client-footer-text, #host-footer-text {
-  text-align: center;
-}
-
-#current-email {
-  color: rgba(0, 0, 0, 0.5);
-}
-
-#daemon-control {
-  margin-top: 50px;
-}
-
-#dialog-screen {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-color: #fff;
-  opacity: 0.75;
-}
-
-#divider-top {
-  margin: 10px 0 15px 0;
-}
-
-#divider-bottom {
-  margin: 25px 0 10px 0;
-}
-
-#email-status {
-  margin-__MSG_@@bidi_end_edge__: 0.5ex;
-}
-
-#icon {
-  height: 64px;
-  width: 64px;
-}
-
-#main {
-  color: rgb(115, 115, 115);
-  font-size: 16px;
-  margin: 100px auto 0 auto;
-  padding: 10px;
-  width: 640px;
-}
-
-#host-list-error {
-  margin-__MSG_@@bidi_start_edge__: 40px;
-}
-
-#session-mode {
-  position: absolute;
-  -webkit-box-shadow: 0 0 8px 0 black;
-  -webkit-user-select: none;
-}
-
-#session-client-plugin {
-  display: block;
-}
-
-#toggle-scaling {
-  margin: 1px 0 0 0;
-  padding: 1px;
-  min-width: 0;
-  line-height: 0;
-}
diff --git a/remoting/webapp/event_handlers.js b/remoting/webapp/event_handlers.js
index 285c5d9..88a4e28 100644
--- a/remoting/webapp/event_handlers.js
+++ b/remoting/webapp/event_handlers.js
@@ -9,7 +9,7 @@ var remoting = remoting || {};
 
 function onLoad() {
   var goHome = function() {
-    window.location.replace(chrome.extension.getURL('choice.html'));
+    window.location.replace(chrome.extension.getURL('main.html'));
   };
   var goEnterAccessCode = function() {
     remoting.setMode(remoting.AppMode.CLIENT_UNCONNECTED);
diff --git a/remoting/webapp/host_table_entry.js b/remoting/webapp/host_table_entry.js
index 86e9409..2774acf 100644
--- a/remoting/webapp/host_table_entry.js
+++ b/remoting/webapp/host_table_entry.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -86,7 +86,7 @@ remoting.HostTableEntry.prototype.init = function(host, onRename, onDelete) {
   // Create the host status cell.
   var hostStatus = document.createElement('td');
   if (host.status == 'ONLINE') {
-    var hostUrl = chrome.extension.getURL('choice.html') +
+    var hostUrl = chrome.extension.getURL('main.html') +
         '?mode=me2me&hostId=' + encodeURIComponent(host.hostId);
     var connectButton = document.createElement('button');
     connectButton.setAttribute('class', 'mode-select-button');
diff --git a/remoting/webapp/main.css b/remoting/webapp/main.css
index c05ad44..80350a4 100644
--- a/remoting/webapp/main.css
+++ b/remoting/webapp/main.css
@@ -1,8 +1,412 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+a {
+  color: rgb(0, 102, 204);
+  text-decoration: none;
+}
+
+body {
+  background: -webkit-gradient(radial, center center, 0, center center, 400,
+                               from(rgb(254, 254, 254)),
+                               to(rgb(239, 239, 239)));
+  font-family: 'Open sans', Arial, sans-serif;
+  margin:0;
+  padding:0;
+  direction: __MSG_@@bidi_dir__;
+}
+
+button, input {
+  font-family: inherit;
+  font-size: inherit;
+}
+
+button {
+  background: -webkit-linear-gradient(#fafafa, #f4f4f4 40%, #e5e5e5);
+  border: 1px solid #aaa;
+  min-width: 72px;
+  -webkit-border-radius: 2px;
+  -webkit-box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1);
+  -webkit-user-select: none;
+}
+
+button:hover {
+  background: #ebebeb -webkit-linear-gradient(#fefefe, #f8f8f8 40%, #e9e9e9);
+  border-color: #999;
+  color: #222;
+  -webkit-box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2);
+}
+
+button:active, .toggle-button-active, .toggle-button-active:hover {
+  background: #ebebeb -webkit-linear-gradient(#f4f4f4, #efefef 40%, #dcdcdc);
+  color: #333;
+  -webkit-box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.2);
+}
+
+button[disabled], .button[disabled]:hover {
+  background: -webkit-linear-gradient(#fafafa, #f4f4f4 40%, #e5e5e5);
+  border-color: #aaa;
+  color: #888;
+  -webkit-box-shadow: none;
+}
+
 form {
   display: inline;
 }
+
+h1 {
+  font-size: 24px;
+  font-weight: normal;
+}
+
+html {
+  /*
+    Used to force background gradient to center correctly.
+    http://crbug.com/109705
+  */
+  height: 100%;
+}
+
+label {
+  color: black;
+  font-weight: bold;
+}
+
+/* Classes */
+
+.access-code-digit-group {
+  /*
+    Used for each of the four-digit components of the access code as
+    displayed by the host.
+  */
+  padding: 0px 6px;
+}
+
+.big-button {
+  height: 2em;
+  font-size: 16px;
+  padding: 6px;
+}
+
+.centered-button {
+  /*
+    Used to force buttons to center correctly on Chrome due to a quirk
+    with laying out buttons. http://crbug.com/84654
+
+    TODO(ajwong): Either fix Chrome layout behavior, or if Chrome is actually
+    conforming correctly to the standard, remove this comment.
+  */
+  text-align: center;
+}
+
+.collapsed {
+  opacity: 0;
+  height: 0 !important;
+}
+
+.choice-header {
+  font-size: 24px;
+  font-weight: normal;
+  margin-__MSG_@@bidi_start_edge__: 10px;
+}
+
+.choice-footer {
+  font-size: 14px;
+}
+
+.choice-panel {
+  margin-top: 17px;
+  padding-bottom: 20px;
+}
+
+.clickable {
+  cursor: pointer;
+}
+
+.description {
+  margin-bottom: 25px;
+}
+
+.error-state {
+  background-image: url('icon_warning.png');
+  background-repeat: no-repeat;
+  background-position: top __MSG_@@bidi_start_edge__;
+  padding-__MSG_@@bidi_start_edge__: 30px;
+  padding-top: 3px;
+  margin-bottom: 10px;
+  color: #900;
+  display: inline-block;
+}
+
+.expiring {
+    color: #900 !important;
+}
+
+[hidden] {
+  display: none !important;
+}
+
+
+.icon-label {
+  display: inline-block;
+  vertical-align: top;
+  margin-__MSG_@@bidi_start_edge__: 10px;
+}
+
+.information-box {
+  background-color: #f9edbe;
+  border: 1px solid #f0c36d;
+  -webkit-border-radius: 2px;
+  -webkit-box-shadow: 0px 2px 4px rgba(0,0,0,0.2);
+  color: #222;
+  padding: 8px 16px;
+  text-align: center;
+  font-size: 12px;
+}
+
+.information-box-centerer {
+  width: 100%;
+  bottom: 8px;
+  position: absolute;
+  display: -webkit-box;
+}
+
+.information-box-padding {
+  -webkit-box-flex: 1;
+}
+
+.message {
+  text-align:center;
+  margin-bottom: 10px;
+}
+
+.mode-select-button {
+  width: 100%;
+  height: 32px;
+  white-space: nowrap;
+}
+
+.mode-select-label {
+  padding-__MSG_@@bidi_end_edge__: 20px;
+}
+
+.mode-select-table {
+  margin-__MSG_@@bidi_start_edge__: 40px;
+  width: 600px;  /* width + margin = body width */
+  border-collapse: collapse;
+  margin-top: 40px;
+}
+
+.mode-select-table-spacer {
+  height: 20px;
+}
+
+.mode-select-table-underline td {
+  border-bottom: 1px solid #c6c6c6;
+}
+
+.hide-scrollbars {
+  overflow-y: hidden;
+}
+
+.host-list-container {
+  -webkit-transition: all 0.5s;
+  overflow: hidden;
+}
+
+.host-list-table {
+  margin-__MSG_@@bidi_start_edge__: 30px;
+  width: 610px;  /* width + margin = body width */
+  border-spacing: 0;
+}
+
+.host-list-row {
+  height: 50px;
+  color: black;
+}
+
+.host-list-row td {
+  border-bottom: 1px solid transparent;
+  border-top: 1px solid transparent;
+}
+
+.host-list-row:hover {
+  background-color: #e7eef2;
+}
+
+.host-list-rename-icon, .host-list-remove-icon {
+  opacity: 0;
+}
+
+.host-list-row:hover .host-list-rename-icon {
+  opacity: 0.8;
+}
+
+.host-list-row:hover .host-list-remove-icon {
+  opacity: 0.3;
+}
+
+.host-list-edit:hover .host-list-rename-icon {
+  opacity: 1;
+}
+
+.host-list-edit:hover .host-list-remove-icon {
+  opacity: 0.5;
+}
+
+.host-list-row:hover td {
+  border-bottom: 1px solid #c6c6c6;
+  border-top: 1px solid #c6c6c6;
+}
+
+.host-list-row-end {
+  padding-__MSG_@@bidi_end_edge__: 10px;
+}
+
+.host-list-row-start {
+  padding-__MSG_@@bidi_start_edge__: 10px;
+}
+
+.host-offline {
+  color: #a9a9a9;
+}
+
+.host-offline .host-list-main-icon {
+  opacity: 0.5;
+}
+
+.small-print {
+  font-size: 13px;
+  color: #AAA;
+}
+
+.top-primary {
+  font-size: 14px;
+  position: absolute;
+  top: 0.5em;
+  __MSG_@@bidi_start_edge__: 0.5em;
+}
+
+.top-secondary {
+  font-size: 14px;
+  position: absolute;
+  top: 0.5em;
+  __MSG_@@bidi_end_edge__: 0.5em;
+}
+
+.waiting {
+  color: rgb(180, 180, 180);
+}
+
+/* Ids */
+#access-code-countdown-container {
+  height: 50px;
+  text-align: center;
+}
+
+#access-code-display {
+  margin-top: 50px;
+  color: rgb(0, 0, 0);
+  font-weight: bold;
+  font-size: 26px;
+  text-align: center;
+}
+
+#access-code-entry {
+  font-weight: bold;
+  font-size: 18px;
+  height: 25px;
+  margin: 0 10px;
+  padding-__MSG_@@bidi_start_edge__: 5px;
+  width: 12em;
+}
+
+#access-code-entry-row {
+  text-align: center;
+}
+
+#ask-pin-dialog {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 380px;
+  height: 180px;
+  margin-left: -200px;
+  border: 1px solid black;
+  background-color: #fff;
+  padding: 0 20px;
+}
+
+#cancel-button {
+  float: __MSG_@@bidi_end_edge__;
+}
+
+#client-footer-text, #host-footer-text {
+  text-align: center;
+}
+
+#current-email {
+  color: rgba(0, 0, 0, 0.5);
+}
+
+#daemon-control {
+  margin-top: 50px;
+}
+
+#dialog-screen {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+  opacity: 0.75;
+}
+
+#divider-top {
+  margin: 10px 0 15px 0;
+}
+
+#divider-bottom {
+  margin: 25px 0 10px 0;
+}
+
+#email-status {
+  margin-__MSG_@@bidi_end_edge__: 0.5ex;
+}
+
+#icon {
+  height: 64px;
+  width: 64px;
+}
+
+#main {
+  color: rgb(115, 115, 115);
+  font-size: 16px;
+  margin: 100px auto 0 auto;
+  padding: 10px;
+  width: 640px;
+}
+
+#host-list-error {
+  margin-__MSG_@@bidi_start_edge__: 40px;
+}
+
+#session-mode {
+  position: absolute;
+  -webkit-box-shadow: 0 0 8px 0 black;
+  -webkit-user-select: none;
+}
+
+#session-client-plugin {
+  display: block;
+}
+
+#toggle-scaling {
+  margin: 1px 0 0 0;
+  padding: 1px;
+  min-width: 0;
+  line-height: 0;
+}
diff --git a/remoting/webapp/choice.html b/remoting/webapp/main.html
index 28d89d33..4f98247 100644
--- a/remoting/webapp/choice.html
+++ b/remoting/webapp/main.html
@@ -13,7 +13,6 @@ found in the LICENSE file.
     <link rel="icon" type="image/png" href="chromoting16.png" />
     <link rel="stylesheet" href="debug_log.css" />
     <link rel="stylesheet" href="main.css" />
-    <link rel="stylesheet" href="choice.css" />
     <link rel="stylesheet" href="toolbar.css" />
     <script src="ask_pin_dialog.js"></script>
     <script src="client_plugin_async.js"></script>
diff --git a/remoting/webapp/manifest.json b/remoting/webapp/manifest.json
index 01d1f52..cf707e4 100644
--- a/remoting/webapp/manifest.json
+++ b/remoting/webapp/manifest.json
@@ -5,7 +5,7 @@
   "default_locale": "en",
   "app": {
     "launch": {
-      "local_path": "choice.html"
+      "local_path": "main.html"
     }
   },
   "icons": {
diff --git a/remoting/webapp/oauth2_callback.html b/remoting/webapp/oauth2_callback.html
index ad635e5..9c1fcc3 100644
--- a/remoting/webapp/oauth2_callback.html
+++ b/remoting/webapp/oauth2_callback.html
@@ -23,10 +23,10 @@ found in the LICENSE file.
         if ('code' in queryArgs) {
           var oauth2 = new remoting.OAuth2();
           oauth2.exchangeCodeForToken(queryArgs['code'], function() {
-            window.location.replace(chrome.extension.getURL('choice.html'));
+            window.location.replace(chrome.extension.getURL('main.html'));
           });
         } else {
-          window.location.replace(chrome.extension.getURL('choice.html'));
+          window.location.replace(chrome.extension.getURL('main.html'));
         }
       }
 
diff --git a/remoting/webapp/ui_mode.js b/remoting/webapp/ui_mode.js
index b425bc1..9020481 100644
--- a/remoting/webapp/ui_mode.js
+++ b/remoting/webapp/ui_mode.js
@@ -72,7 +72,9 @@ remoting.setMode = function(mode) {
   } else {
     document.addEventListener('keydown', remoting.DebugLog.onKeydown, false);
   }
-  if (mode == remoting.AppMode.HOME) {
+  if (mode == remoting.AppMode.HOME ||
+      mode == remoting.AppMode.HOME_DAEMON_ENABLED ||
+      mode == remoting.AppMode.HOME_DAEMON_DISABLED) {
     var display = function() { remoting.hostList.display(); };
     remoting.hostList.refresh(display);
   }