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

chrome/browser/chromeos/options/network_config_view.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 26 matching lines @@
     // Called when dialog "OK" button is pressed.
     virtual void OnDialogAccepted() = 0;
 
     // Called when dialog "Cancel" button is pressed.
     virtual void OnDialogCancelled() = 0;
 
    protected:
      virtual ~Delegate() {}
   };
 
-  // Shows a network connection dialog if none is currently visible.
-  static void Show(const std::string& service_path, gfx::NativeWindow parent);
+  // Shows a network connection dialog if none is currently visible. The dialog
+  // will be a child of |parent| (e.g. the webui settings window) which ensures
+  // it appears on the display the user is looking at.
+  static void ShowInParent(const std::string& network_id,
+                           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 places the dialog in the given container on the primary
+  // display. Used as a fallback when no parent is available.
+  static void ShowInContainer(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.
   static void ShowForType(const std::string& type, gfx::NativeWindow parent);
 
   // Returns corresponding native window.
   gfx::NativeWindow GetNativeWindow() const;
 
   // views::DialogDelegate methods.
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
@@ skipping 21 matching lines @@
   // views::View overrides:
   void Layout() override;
   gfx::Size GetPreferredSize() const override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
 
  private:
   NetworkConfigView();
   ~NetworkConfigView() override;
 
-  static void ShowByNetwork(const NetworkState* network,
-                            gfx::NativeWindow parent);
+  static void ShowImpl(const std::string& network_id,
+                       gfx::NativeWindow parent,
+                       int container_id);
 
   // Login dialog for known networks. Returns true if successfully created.
   bool InitWithNetworkState(const NetworkState* network);
   // Login dialog for new/hidden networks. Returns true if successfully created.
   bool InitWithType(const std::string& type);
 
   // 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();
 
   // There's always only one child view, which will get deleted when
   // NetworkConfigView gets cleaned up.
   ChildNetworkConfigView* child_config_view_;
 
   Delegate* delegate_;
 
@@ skipping 64 matching lines @@
  private:
   bool managed_;
   views::ImageView* image_view_;
 
   DISALLOW_COPY_AND_ASSIGN(ControlledSettingIndicatorView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_