Merge "arc: Implement scrollable OptIn window content."

chrome/browser/chromeos/arc/arc_support_host.cc

Index: chrome/browser/chromeos/arc/arc_support_host.cc
diff --git a/chrome/browser/chromeos/arc/arc_support_host.cc b/chrome/browser/chromeos/arc/arc_support_host.cc
index 805e53a28ddb66d24490f13231b09de3114e727c..f49c7cf75124f96268c130b8c523c6bd4120a878 100644
--- a/chrome/browser/chromeos/arc/arc_support_host.cc
+++ b/chrome/browser/chromeos/arc/arc_support_host.cc
@@ -26,6 +26,7 @@
 #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 {
 const char kAction[] = "action";
@@ -41,6 +42,7 @@ const char kStatus[] = "status";
 const char kText[] = "text";
 const char kActionInitialize[] = "initialize";
 const char kActionSetMetricsMode[] = "setMetricsMode";
+const char kActionSetWindowBounds[] = "setWindowBounds";
 const char kActionStartLso[] = "startLso";
 const char kActionCancelAuthCode[] = "cancelAuthCode";
 const char kActionSetAuthCode[] = "setAuthCode";
@@ -77,6 +79,7 @@ ArcSupportHost::ArcSupportHost() {
     return;
 
   arc_auth_service->AddObserver(this);
+  display::Screen::GetScreen()->AddObserver(this);
 
   pref_change_registrar_.Init(g_browser_process->local_state());
   pref_change_registrar_.Add(
@@ -86,6 +89,7 @@ ArcSupportHost::ArcSupportHost() {
 }
 
 ArcSupportHost::~ArcSupportHost() {
+  display::Screen::GetScreen()->RemoveObserver(this);
   arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();
   if (arc_auth_service)
     arc_auth_service->RemoveObserver(this);
@@ -179,6 +183,19 @@ bool ArcSupportHost::Initialize() {
   return true;
 }
 
+void ArcSupportHost::OnDisplayAdded(const display::Display& new_display) {}
+
+void ArcSupportHost::OnDisplayRemoved(const display::Display& old_display) {}
+
+void ArcSupportHost::OnDisplayMetricsChanged(const display::Display& display,
+                                             uint32_t changed_metrics) {
+  base::DictionaryValue request;
+  std::string request_string;
+  request.SetString(kAction, kActionSetWindowBounds);
+  base::JSONWriter::Write(request, &request_string);
+  client_->PostMessageFromNativeHost(request_string);
+}
+
 void ArcSupportHost::OnMetricsPreferenceChanged() {
   SendMetricsMode();
 }