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

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

 // Copyright 2014 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/login/ui/login_web_dialog.h"
 
 #include <deque>
 
 #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"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/widget/widget.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
@@ skipping 33 matching lines @@
       url_(url),
       is_open_(false) {
   gfx::Rect screen_bounds(CalculateScreenBounds(gfx::Size()));
   width_ = static_cast<int>(kDefaultWidthRatio * screen_bounds.width());
   height_ = static_cast<int>(kDefaultHeightRatio * screen_bounds.height());
 }
 
 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;
 }
 
 void LoginWebDialog::SetDialogSize(int width, int height) {
   DCHECK_GE(width, 0);
   DCHECK_GE(height, 0);
   width_ = width;
   height_ = height;
 }
 
@@ skipping 82 matching lines @@
   // so we must suppress it.
   // http://crbug.com/443096
   return (source && !chrome::FindBrowserWithWebContents(source));
 }
 
 bool LoginWebDialog::HandleShouldCreateWebContents() {
   return false;
 }
 
 }  // namespace chromeos