mash: Place views Wi-Fi network config dialogs in correct window parent

chrome/browser/chromeos/options/network_config_view.h

Index: chrome/browser/chromeos/options/network_config_view.h
diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h
index 3df14324b9579293e61002a5d5236c00d6f92528..7c73b8bb9ddb267d1b09f77145b538bbb76c0625 100644
--- a/chrome/browser/chromeos/options/network_config_view.h
+++ b/chrome/browser/chromeos/options/network_config_view.h
@@ -45,11 +45,12 @@ class NetworkConfigView : public views::DialogDelegateView,
   };
 
   // Shows a network connection dialog if none is currently visible.

[stevenjb, 2016/10/20 19:42:40]

Maybe add 'TODO: deprecate' or explain why we use |parent| here and
|container_id| below. (Or have both take parent and container id, even though we
happen to only use one or the other).

[James Cook, 2016/10/20 20:10:34]

Done. I kept it as two functions so the caller doesn't have to reason about what
happens if you specify both (or none).

-  static void Show(const std::string& service_path, gfx::NativeWindow parent);
+  static void ShowByServicePath(const std::string& service_path,
+                                gfx::NativeWindow parent);
 
-  // Same as above but takes a network id (GUID) instead.
-  static void ShowByNetworkId(const std::string& network_id,
-                              gfx::NativeWindow parent);
+  // Same as above but takes a network id (GUID) and places the dialog in the
+  // given container on the primary display.
+  static void ShowByNetworkId(const std::string& network_id, int container_id);
 
   // Shows a dialog to configure a new network. |type| must be a valid Shill
   // 'Type' property value.
@@ -92,7 +93,8 @@ class NetworkConfigView : public views::DialogDelegateView,
   ~NetworkConfigView() override;
 
   static void ShowByNetwork(const NetworkState* network,
-                            gfx::NativeWindow parent);
+                            gfx::NativeWindow parent,
+                            int container_id);
 
   // Login dialog for known networks. Returns true if successfully created.
   bool InitWithNetworkState(const NetworkState* network);
@@ -101,6 +103,7 @@ class NetworkConfigView : public views::DialogDelegateView,
 
   // Creates and shows a dialog containing this view.
   void ShowDialog(gfx::NativeWindow parent);
+  void ShowDialogInContainer(int container_id);
 
   // Resets the underlying view to show advanced options.
   void ShowAdvancedView();