chromeos: Make enterprise help dialog work in mash, part 1

chrome/browser/chromeos/login/ui/login_web_dialog.cc

Index: chrome/browser/chromeos/login/ui/login_web_dialog.cc
diff --git a/chrome/browser/chromeos/login/ui/login_web_dialog.cc b/chrome/browser/chromeos/login/ui/login_web_dialog.cc
index 5a861bfd8edc43a0f9bc62c1144591bcefdfd6c4..2effa63e1f00a5105460502c4fff6046a319685d 100644
--- a/chrome/browser/chromeos/login/ui/login_web_dialog.cc
+++ b/chrome/browser/chromeos/login/ui/login_web_dialog.cc
@@ -9,6 +9,7 @@
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
+#include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "content/public/browser/browser_context.h"
@@ -62,7 +63,12 @@ LoginWebDialog::LoginWebDialog(content::BrowserContext* browser_context,
 LoginWebDialog::~LoginWebDialog() {}
 
 void LoginWebDialog::Show() {
-  chrome::ShowWebDialog(parent_window_, browser_context_, this);
+  if (parent_window_) {
+    chrome::ShowWebDialog(parent_window_, browser_context_, this);
+  } else {
+    chrome::ShowWebDialogInContainer(
+        SystemTrayClient::GetDialogParentContainerId(), browser_context_, this);

[James Cook, 2016/10/26 17:58:09]

Aside: I would like to move GetDialogParentContainerId() to a utility file, but
that would require moving GetUserLoginState() as well, and I'd prefer to wait on
that until the login service is better defined.

[xiyuan, 2016/10/26 19:30:06]

Acknowledged.

+  }
   is_open_ = true;
 }