Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4728)

Unified Diff: chrome/browser/chromeos/options/network_config_view.h

Issue 2445843002: chromeos: Convert "show other network" dialog to work with mash (Closed)
Patch Set: tweak Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0ffd10c0ca5d9bd6301da64885bac0b92cc3db3c..de48279126f115e3482209a0d692860e5c47cced 100644
--- a/chrome/browser/chromeos/options/network_config_view.h
+++ b/chrome/browser/chromeos/options/network_config_view.h
@@ -58,6 +58,10 @@ class NetworkConfigView : public views::DialogDelegateView,
// 'Type' property value.
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;
@@ -94,9 +98,11 @@ class NetworkConfigView : public views::DialogDelegateView,
NetworkConfigView();
~NetworkConfigView() override;
- static void ShowImpl(const std::string& network_id,
- gfx::NativeWindow parent,
- int container_id);
+ // 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);

Powered by Google App Engine
This is Rietveld 408576698