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

Unified Diff: chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc

Issue 2446573003: chromeos: Make "mobile network" and "set time" dialogs work with mash (Closed)
Patch Set: gn check 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
« no previous file with comments | « chrome/browser/chromeos/ui/choose_mobile_network_dialog.h ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc
diff --git a/chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc b/chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc
index 0da2c86936efd7041d7299b9229ebd4579b47eba..07a0546e17eb57c507f2f15789457beaeb751abf 100644
--- a/chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc
+++ b/chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
+#include "ash/public/cpp/shell_window_ids.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/common/url_constants.h"
@@ -23,12 +24,21 @@ const int kDefaultHeight = 225;
namespace chromeos {
// static
-void ChooseMobileNetworkDialog::ShowDialog(gfx::NativeWindow owning_window) {
- chrome::ShowWebDialog(owning_window,
- ProfileManager::GetActiveUserProfile(),
+void ChooseMobileNetworkDialog::ShowDialog(gfx::NativeWindow parent) {
+ chrome::ShowWebDialog(parent, ProfileManager::GetActiveUserProfile(),
new ChooseMobileNetworkDialog);
}
+// static
+void ChooseMobileNetworkDialog::ShowDialogInContainer(int container_id) {
+ // Dialog should be in a modal window container.
+ DCHECK(container_id == ash::kShellWindowId_SystemModalContainer ||
+ container_id == ash::kShellWindowId_LockSystemModalContainer);
+ chrome::ShowWebDialogInContainer(container_id,
+ ProfileManager::GetActiveUserProfile(),
+ new ChooseMobileNetworkDialog);
+}
+
ChooseMobileNetworkDialog::ChooseMobileNetworkDialog() {
}
« no previous file with comments | « chrome/browser/chromeos/ui/choose_mobile_network_dialog.h ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698