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

Side by Side Diff: chromeos/network/network_connection_handler.cc

Issue 2836543002: Revert of [CrOS Tether] Add the notion of a tether DeviceState. (Closed)
Patch Set: Created 3 years, 8 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 | « chromeos/network/network_connection_handler.h ('k') | chromeos/network/network_state_handler.h » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chromeos/network/network_connection_handler.h" 5 #include "chromeos/network/network_connection_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 "disconnect-failed"; 111 "disconnect-failed";
112 const char NetworkConnectionHandler::kErrorConfigureFailed[] = 112 const char NetworkConnectionHandler::kErrorConfigureFailed[] =
113 "configure-failed"; 113 "configure-failed";
114 const char NetworkConnectionHandler::kErrorConnectCanceled[] = 114 const char NetworkConnectionHandler::kErrorConnectCanceled[] =
115 "connect-canceled"; 115 "connect-canceled";
116 const char NetworkConnectionHandler::kErrorCertLoadTimeout[] = 116 const char NetworkConnectionHandler::kErrorCertLoadTimeout[] =
117 "cert-load-timeout"; 117 "cert-load-timeout";
118 const char NetworkConnectionHandler::kErrorUnmanagedNetwork[] = 118 const char NetworkConnectionHandler::kErrorUnmanagedNetwork[] =
119 "unmanaged-network"; 119 "unmanaged-network";
120 const char NetworkConnectionHandler::kErrorActivateFailed[] = "activate-failed"; 120 const char NetworkConnectionHandler::kErrorActivateFailed[] = "activate-failed";
121 const char NetworkConnectionHandler::kEnabledOrDisabledWhenNotAvailable[] =
122 "not-available";
123 121
124 struct NetworkConnectionHandler::ConnectRequest { 122 struct NetworkConnectionHandler::ConnectRequest {
125 ConnectRequest(const std::string& service_path, 123 ConnectRequest(const std::string& service_path,
126 const std::string& profile_path, 124 const std::string& profile_path,
127 const base::Closure& success, 125 const base::Closure& success,
128 const network_handler::ErrorCallback& error) 126 const network_handler::ErrorCallback& error)
129 : service_path(service_path), 127 : service_path(service_path),
130 profile_path(profile_path), 128 profile_path(profile_path),
131 connect_state(CONNECT_REQUESTED), 129 connect_state(CONNECT_REQUESTED),
132 success_callback(success), 130 success_callback(success),
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 810
813 void NetworkConnectionHandler::HandleShillDisconnectSuccess( 811 void NetworkConnectionHandler::HandleShillDisconnectSuccess(
814 const std::string& service_path, 812 const std::string& service_path,
815 const base::Closure& success_callback) { 813 const base::Closure& success_callback) {
816 NET_LOG_EVENT("Disconnect Request Sent", service_path); 814 NET_LOG_EVENT("Disconnect Request Sent", service_path);
817 if (!success_callback.is_null()) 815 if (!success_callback.is_null())
818 success_callback.Run(); 816 success_callback.Run();
819 } 817 }
820 818
821 } // namespace chromeos 819 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/network_connection_handler.h ('k') | chromeos/network/network_state_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698