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

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

Issue 2458883002: chromeos: Refactor NetworkConfigView to use shared widget parent code for mash (Closed)
Patch Set: rebase Created 4 years, 1 month 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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 network->third_party_vpn_provider_extension_id(), network->name()); 239 network->third_party_vpn_provider_extension_id(), network->name());
240 return; 240 return;
241 } 241 }
242 242
243 // If a network is not connectable, show the enrollment dialog if available. 243 // If a network is not connectable, show the enrollment dialog if available.
244 if (!force_show && !network->connectable() && 244 if (!force_show && !network->connectable() &&
245 enrollment::CreateEnrollmentDialog(guid, GetNativeWindow())) { 245 enrollment::CreateEnrollmentDialog(guid, GetNativeWindow())) {
246 return; 246 return;
247 } 247 }
248 248
249 NetworkConfigView::ShowInParent(guid, GetNativeWindow()); 249 NetworkConfigView::ShowForNetworkId(guid, GetNativeWindow());
250 } 250 }
251 251
252 } // namespace options 252 } // namespace options
253 } // namespace chromeos 253 } // 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