NetworkConfigView: Prevent SystemWebDialogDelegate from opening

There are a few cases where a user might open a
SystemWebDialogDelegate while NetworkConfigView is open.

NetworkConfigView uses SystemTrayClient::CreateUnownedDialogWidget
which does not interact well with SystemWebDialogDelegate
(see issue).

Since NetworkConfigView will soon be deprecated, the simplest
short term fix is to not show any SystemWebDialogDelegate
instance while NetworkConfigView is shown. This will not seem
to strange to a user since NetworkConfigView is a modal dialog.

Bug: 791955
Change-Id: Ibe37ff737df69d5d02670c435124e2837ddb0bab
Reviewed-on: https://chromium-review.googlesource.com/825626Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523955}

chrome/browser/chromeos/options/network_config_view.cc

@@ -93,6 +93,11 @@ NetworkConfigView::~NetworkConfigView() {
   g_instance = nullptr;
 }
 
+// static
+bool NetworkConfigView::HasInstance() {
+  return !!g_instance;
+}
+
 // static
 NetworkConfigView* NetworkConfigView::ShowForNetworkId(
     const std::string& network_id) {

chrome/browser/chromeos/options/network_config_view.h

@@ -39,6 +39,9 @@ class NetworkConfigView : public views::DialogDelegateView,
      virtual ~Delegate() {}
   };
 
+  // Returns true if a NetworkConfigView instance exists.
+  static bool HasInstance();
+
   // Shows a network connection dialog if none is currently visible. The dialog
   // is placed on the default display for new windows. Returns the dialog or
   // nullptr on error.

chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "components/session_manager/core/session_manager.h"
@@ -56,6 +57,13 @@ bool SystemWebDialogDelegate::ShouldShowDialogTitle() const {
 }
 
 void SystemWebDialogDelegate::ShowSystemDialog() {
+  // NetworkConfigView does not interact well with web dialogs. For now, do
+  // not show the dialog while NetworkConfigView is shown: crbug.com/791955.
+  // TODO(stevenjb): Remove this when NetworkConfigView is deprecated.
+  if (NetworkConfigView::HasInstance()) {
+    delete this;
+    return;
+  }
   content::BrowserContext* browser_context =
       ProfileManager::GetActiveUserProfile();
   int container_id = session_manager::SessionManager::Get()->session_state() ==