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

Side by Side Diff: ash/mus/network_connect_delegate_mus.cc

Issue 2761063002: Move more from WmShell to Shell (Closed)
Patch Set: merge Created 3 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
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/test/wm_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/mus/network_connect_delegate_mus.h" 5 #include "ash/mus/network_connect_delegate_mus.h"
6 6
7 #include "ash/common/system/tray/system_tray_controller.h" 7 #include "ash/common/system/tray/system_tray_controller.h"
8 #include "ash/common/wm_shell.h" 8 #include "ash/shell.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 10
11 namespace ash { 11 namespace ash {
12 namespace mus { 12 namespace mus {
13 13
14 NetworkConnectDelegateMus::NetworkConnectDelegateMus() {} 14 NetworkConnectDelegateMus::NetworkConnectDelegateMus() {}
15 15
16 NetworkConnectDelegateMus::~NetworkConnectDelegateMus() {} 16 NetworkConnectDelegateMus::~NetworkConnectDelegateMus() {}
17 17
18 void NetworkConnectDelegateMus::ShowNetworkConfigure( 18 void NetworkConnectDelegateMus::ShowNetworkConfigure(
19 const std::string& network_id) { 19 const std::string& network_id) {
20 WmShell::Get()->system_tray_controller()->ShowNetworkConfigure(network_id); 20 Shell::Get()->system_tray_controller()->ShowNetworkConfigure(network_id);
21 } 21 }
22 22
23 void NetworkConnectDelegateMus::ShowNetworkSettings( 23 void NetworkConnectDelegateMus::ShowNetworkSettings(
24 const std::string& network_id) { 24 const std::string& network_id) {
25 WmShell::Get()->system_tray_controller()->ShowNetworkSettings(network_id); 25 Shell::Get()->system_tray_controller()->ShowNetworkSettings(network_id);
26 } 26 }
27 27
28 bool NetworkConnectDelegateMus::ShowEnrollNetwork( 28 bool NetworkConnectDelegateMus::ShowEnrollNetwork(
29 const std::string& network_id) { 29 const std::string& network_id) {
30 // TODO(mash): http://crbug.com/644355 30 // TODO(mash): http://crbug.com/644355
31 NOTIMPLEMENTED(); 31 NOTIMPLEMENTED();
32 return false; 32 return false;
33 } 33 }
34 34
35 void NetworkConnectDelegateMus::ShowMobileSimDialog() { 35 void NetworkConnectDelegateMus::ShowMobileSimDialog() {
(...skipping 16 matching lines...) Expand all
52 } 52 }
53 53
54 void NetworkConnectDelegateMus::ShowMobileActivationError( 54 void NetworkConnectDelegateMus::ShowMobileActivationError(
55 const std::string& network_id) { 55 const std::string& network_id) {
56 // TODO(mash): http://crbug.com/644355 56 // TODO(mash): http://crbug.com/644355
57 LOG(ERROR) << "Mobile Activation Error For: " << network_id; 57 LOG(ERROR) << "Mobile Activation Error For: " << network_id;
58 } 58 }
59 59
60 } // namespace mus 60 } // namespace mus
61 } // namespace ash 61 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/test/wm_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698