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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Issue 2426473009: mash: Place views Wi-Fi network config dialogs in correct window parent (Closed)
Patch Set: review comments 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
6 6
7 #include <ctype.h> 7 #include <ctype.h>
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 network->third_party_vpn_provider_extension_id(), network->name()); 256 network->third_party_vpn_provider_extension_id(), network->name());
257 return; 257 return;
258 } 258 }
259 259
260 // If a network is not connectable, show the enrollment dialog if available. 260 // If a network is not connectable, show the enrollment dialog if available.
261 if (!force_show && !network->connectable() && 261 if (!force_show && !network->connectable() &&
262 enrollment::CreateDialog(service_path, GetNativeWindow())) { 262 enrollment::CreateDialog(service_path, GetNativeWindow())) {
263 return; 263 return;
264 } 264 }
265 265
266 NetworkConfigView::Show(service_path, GetNativeWindow()); 266 NetworkConfigView::ShowInParent(network->guid(), GetNativeWindow());
267 } 267 }
268 268
269 } // namespace options 269 } // namespace options
270 } // namespace chromeos 270 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_client.cc ('k') | chrome/browser/ui/webui/settings/chromeos/internet_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698