| 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 de48279126f115e3482209a0d692860e5c47cced..672d603fc399dbc99504705a2bebece4e69cbf0b 100644
|
| --- a/chrome/browser/chromeos/options/network_config_view.h
|
| +++ b/chrome/browser/chromeos/options/network_config_view.h
|
| @@ -46,22 +46,16 @@ class NetworkConfigView : public views::DialogDelegateView,
|
|
|
| // 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 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);
|
| + // it appears on the display the user is looking at. If |parent| is null and
|
| + // no fallback parent can be found then the dialog will be placed on the
|
| + // primary display.
|
| + static void ShowForNetworkId(const std::string& network_id,
|
| + gfx::NativeWindow parent);
|
|
|
| // Shows a dialog to configure a new network. |type| must be a valid Shill
|
| - // 'Type' property value.
|
| + // 'Type' property value. See above regarding |parent|.
|
| static void ShowForType(const std::string& type, gfx::NativeWindow parent);
|
|
|
| - // As above but places the dialog in the given ash window container on the
|
| - // primary display. Used as a fallback when no parent is available.
|
| - static void ShowForTypeInContainer(const std::string& type, int container_id);
|
| -
|
| // Returns corresponding native window.
|
| gfx::NativeWindow GetNativeWindow() const;
|
|
|
| @@ -98,12 +92,6 @@ class NetworkConfigView : public views::DialogDelegateView,
|
| NetworkConfigView();
|
| ~NetworkConfigView() override;
|
|
|
| - // Returns null for invalid network or if dialog is already showing.
|
| - static NetworkConfigView* CreateForNetworkId(const std::string& network_id);
|
| -
|
| - // Returns null for invalid network type or if dialog is already showing.
|
| - static NetworkConfigView* CreateForType(const std::string& type);
|
| -
|
| // 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.
|
| @@ -111,7 +99,6 @@ 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();
|
|
|