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

Side by Side Diff: chrome/browser/ui/ash/network_connect_delegate_chromeos.cc

Issue 983823002: Use GUID instead of servicePath in network settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430115_internet_options_enable_extension_apis
Patch Set: Use guid instead of service_path for proxy prefs Created 5 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ash/network_connect_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h"
6 6
7 #include "ash/session/session_state_delegate.h" 7 #include "ash/session/session_state_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/system/tray/system_tray_delegate.h" 10 #include "ash/system/tray/system_tray_delegate.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 NetworkConnectDelegateChromeOS::~NetworkConnectDelegateChromeOS() { 50 NetworkConnectDelegateChromeOS::~NetworkConnectDelegateChromeOS() {
51 } 51 }
52 52
53 void NetworkConnectDelegateChromeOS::ShowNetworkConfigure( 53 void NetworkConnectDelegateChromeOS::ShowNetworkConfigure(
54 const std::string& network_id) { 54 const std::string& network_id) {
55 if (!IsUIAvailable()) 55 if (!IsUIAvailable())
56 return; 56 return;
57 NetworkConfigView::Show(network_id, GetNativeWindow()); 57 NetworkConfigView::Show(network_id, GetNativeWindow());
58 } 58 }
59 59
60 void NetworkConnectDelegateChromeOS::ShowNetworkSettings( 60 void NetworkConnectDelegateChromeOS::ShowNetworkSettingsForGuid(
61 const std::string& service_path) { 61 const std::string& network_id) {
62 if (!IsUIAvailable()) 62 if (!IsUIAvailable())
63 return; 63 return;
64 ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings( 64 ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettingsForGuid(
65 service_path); 65 network_id);
66 } 66 }
67 67
68 bool NetworkConnectDelegateChromeOS::ShowEnrollNetwork( 68 bool NetworkConnectDelegateChromeOS::ShowEnrollNetwork(
69 const std::string& network_id) { 69 const std::string& network_id) {
70 if (!IsUIAvailable()) 70 if (!IsUIAvailable())
71 return false; 71 return false;
72 return enrollment::CreateDialog(network_id, GetNativeWindow()); 72 return enrollment::CreateDialog(network_id, GetNativeWindow());
73 } 73 }
74 74
75 void NetworkConnectDelegateChromeOS::ShowMobileSimDialog() { 75 void NetworkConnectDelegateChromeOS::ShowMobileSimDialog() {
76 if (!IsUIAvailable()) 76 if (!IsUIAvailable())
77 return; 77 return;
78 SimDialogDelegate::ShowDialog(GetNativeWindow(), 78 SimDialogDelegate::ShowDialog(GetNativeWindow(),
79 SimDialogDelegate::SIM_DIALOG_UNLOCK); 79 SimDialogDelegate::SIM_DIALOG_UNLOCK);
80 } 80 }
81 81
82 void NetworkConnectDelegateChromeOS::ShowMobileSetupDialog( 82 void NetworkConnectDelegateChromeOS::ShowMobileSetupDialog(
83 const std::string& service_path) { 83 const std::string& service_path) {
84 if (!IsUIAvailable()) 84 if (!IsUIAvailable())
85 return; 85 return;
86 MobileSetupDialog::Show(service_path); 86 MobileSetupDialog::Show(service_path);
87 } 87 }
88 88
89 } // namespace chromeos 89 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/network_connect_delegate_chromeos.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698