Split ShowPage message into two.

chrome/browser/chromeos/arc/arc_support_host.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 
 #include <string>
 
 #include "ash/common/system/chromeos/devicetype_utils.h"
 #include "base/i18n/timezone.h"
@@ skipping 11 matching lines @@
 #include "components/user_manager/known_user.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/display/screen.h"
 
 namespace {
 constexpr char kAction[] = "action";
 constexpr char kArcManaged[] = "arcManaged";
 constexpr char kData[] = "data";
 constexpr char kDeviceId[] = "deviceId";
-constexpr char kPage[] = "page";
 constexpr char kStatus[] = "status";
 constexpr char kActionInitialize[] = "initialize";
 constexpr char kActionSetMetricsMode[] = "setMetricsMode";
 constexpr char kActionBackupAndRestoreMode[] = "setBackupAndRestoreMode";
 constexpr char kActionLocationServiceMode[] = "setLocationServiceMode";
 constexpr char kActionSetWindowBounds[] = "setWindowBounds";
 constexpr char kActionCloseWindow[] = "closeWindow";
+
+// Action to show a page. The message should have "page" field, which is one of
+// IDs for section div elements.
 constexpr char kActionShowPage[] = "showPage";
+constexpr char kPage[] = "page";
+
+// Action to show an error message. The message should have "errorMessage",
+// which is a localized error text, and "showSendFeedback" boolean value.

[Luis Héctor Chávez, 2016/11/04 17:11:25]

nit: s/an error message/the error page/.

[hidehiko, 2016/11/04 17:49:49]

Done.

+constexpr char kActionShowErrorPage[] = "showErrorPage";
+constexpr char kErrorMessage[] = "errorMessage";
+constexpr char kShowSendFeedback[] = "showSendFeedback";

[xiyuan, 2016/11/04 16:52:40]

nit: showSendFeedback -> shouldShowSendFeedback

showSendFeedback sounds like an action instead of a boolean.

[hidehiko, 2016/11/04 17:49:49]

Done.

 
 // The preference update should have those two fields.
 constexpr char kEnabled[] = "enabled";
 constexpr char kManaged[] = "managed";
 
 // The JSON data sent from the extension should have at least "event" field.
 // Each event data is defined below.
 // The key of the event type.
 constexpr char kEvent[] = "event";
 
@@ skipping 60 matching lines @@
 
 void ArcSupportHost::ShowPage(arc::ArcAuthService::UIPage page,
                               const base::string16& status) {
   if (!message_host_) {
     VLOG(2) << "ArcSupportHost::ShowPage() is called "
             << "but message_host_ is not available.";
     return;
   }
 
   base::DictionaryValue message;
-  message.SetString(kAction, kActionShowPage);
-  message.SetInteger(kPage, static_cast<int>(page));
-  message.SetString(kStatus, status);
+  if (page == arc::ArcAuthService::UIPage::ERROR ||

[hidehiko, 2016/11/04 01:23:46]

Note: we'll split ShowPage() into two for the API simplicity.
Then, this content will be simplified, too.

+      page == arc::ArcAuthService::UIPage::ERROR_WITH_FEEDBACK) {
+    message.SetString(kAction, kActionShowErrorPage);
+    message.SetString(kErrorMessage, status);
+    message.SetBoolean(
+        kShowSendFeedback,
+        page == arc::ArcAuthService::UIPage::ERROR_WITH_FEEDBACK);
+  } else {
+    message.SetString(kAction, kActionShowPage);
+    switch (page) {
+      case arc::ArcAuthService::UIPage::NO_PAGE:
+        message.SetString(kPage, "none");
+        break;
+      case arc::ArcAuthService::UIPage::TERMS:
+        message.SetString(kPage, "terms");
+        break;
+      case arc::ArcAuthService::UIPage::LSO_PROGRESS:
+        message.SetString(kPage, "lso-loading");
+        break;
+      // Skip LSO. LSO and LSO_LOADING should be merged well.
+      // TODO(hidehiko): Do it.
+      case arc::ArcAuthService::UIPage::START_PROGRESS:
+        message.SetString(kPage, "arc-loading");
+        break;
+      default:
+        NOTREACHED();
+        return;
+    }
+  }
   message_host_->SendMessage(message);
 }
 
 void ArcSupportHost::SetMessageHost(arc::ArcSupportMessageHost* message_host) {
   if (message_host_ == message_host)
     return;
 
   if (message_host_)
     DisconnectMessageHost();
   message_host_ = message_host;
@@ skipping 209 matching lines @@
     } else {
       NOTREACHED();
     }
   } else if (event == kEventOnSendFeedbackClicked) {
     chrome::OpenFeedbackDialog(nullptr);
   } else {
     LOG(ERROR) << "Unknown message: " << event;
     NOTREACHED();
   }
 }