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

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

Issue 2396863004: chromeos: Refactor system tray ShowNetworkSettingsForGuid for mash (Closed)
Patch Set: rebase 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 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/common/login_status.h" 7 #include "ash/common/login_status.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/shell_window_ids.h" 9 #include "ash/common/shell_window_ids.h"
10 #include "ash/common/system/tray/system_tray_delegate.h" 10 #include "ash/common/system/tray/system_tray_delegate.h"
11 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "chrome/browser/chromeos/enrollment_dialog_view.h" 13 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
14 #include "chrome/browser/chromeos/options/network_config_view.h" 14 #include "chrome/browser/chromeos/options/network_config_view.h"
15 #include "chrome/browser/chromeos/sim_dialog_delegate.h" 15 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
16 #include "chrome/browser/ui/ash/system_tray_client.h"
16 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" 17 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
17 18
18 namespace { 19 namespace {
19 20
20 bool IsUIAvailable() { 21 bool IsUIAvailable() {
21 return ash::WmShell::HasInstance() && 22 return ash::WmShell::HasInstance() &&
22 !ash::WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked(); 23 !ash::WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked();
23 } 24 }
24 25
25 gfx::NativeWindow GetNativeWindow() { 26 gfx::NativeWindow GetNativeWindow() {
(...skipping 28 matching lines...) Expand all
54 const std::string& network_id) { 55 const std::string& network_id) {
55 if (!IsUIAvailable()) 56 if (!IsUIAvailable())
56 return; 57 return;
57 NetworkConfigView::Show(network_id, GetNativeWindow()); 58 NetworkConfigView::Show(network_id, GetNativeWindow());
58 } 59 }
59 60
60 void NetworkConnectDelegateChromeOS::ShowNetworkSettingsForGuid( 61 void NetworkConnectDelegateChromeOS::ShowNetworkSettingsForGuid(
61 const std::string& network_id) { 62 const std::string& network_id) {
62 if (!IsUIAvailable()) 63 if (!IsUIAvailable())
63 return; 64 return;
64 ash::WmShell::Get()->system_tray_delegate()->ShowNetworkSettingsForGuid( 65 SystemTrayClient::Get()->ShowNetworkSettings(network_id);
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

Powered by Google App Engine
This is Rietveld 408576698