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

Unified Diff: ui/chromeos/network/network_connect.cc

Issue 1426393003: NOT FOR REVIEW Base URL: https://chromium.googlesource.com/chromium/src.git@submit-4.5-split-wcss
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/shell/browser/shell_network_controller_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/chromeos/network/network_connect.cc
diff --git a/ui/chromeos/network/network_connect.cc b/ui/chromeos/network/network_connect.cc
index bc9f02ec6ca05d490a64067bc665313c50c46a28..ec9e391bdba4a598c220510ee3abd847071e4032 100644
--- a/ui/chromeos/network/network_connect.cc
+++ b/ui/chromeos/network/network_connect.cc
@@ -249,6 +249,7 @@ void NetworkConnectImpl::OnConnectSucceeded(const std::string& service_path) {
// networks or repeat connect attempts).
void NetworkConnectImpl::CallConnectToNetwork(const std::string& service_path,
bool check_error_state) {
+ LOG(ERROR) << "*** QUICHE: " << __func__;
network_state_notifier_->RemoveConnectNotification();
NetworkHandler::Get()->network_connection_handler()->ConnectToNetwork(
service_path, base::Bind(&NetworkConnectImpl::OnConnectSucceeded,
@@ -281,6 +282,7 @@ void NetworkConnectImpl::OnConfigureFailed(
void NetworkConnectImpl::OnConfigureSucceeded(bool connect_on_configure,
const std::string& service_path) {
+ LOG(ERROR) << "*** QUICHE: " << __func__;
NET_LOG_USER("Configure Succeeded", service_path);
if (!connect_on_configure)
return;
@@ -293,6 +295,7 @@ void NetworkConnectImpl::CallCreateConfiguration(
base::DictionaryValue* shill_properties,
bool shared,
bool connect_on_configure) {
+ LOG(ERROR) << "*** QUICHE: " << __func__;
std::string profile_path;
if (!GetNetworkProfilePath(shared, &profile_path)) {
network_state_notifier_->ShowNetworkConnectError(
@@ -341,6 +344,7 @@ void NetworkConnectImpl::SetPropertiesToClear(
void NetworkConnectImpl::ClearPropertiesAndConnect(
const std::string& service_path,
const std::vector<std::string>& properties_to_clear) {
+ LOG(ERROR) << "*** QUICHE: " << __func__;
NET_LOG_USER("ClearPropertiesAndConnect", service_path);
// After configuring a network, ignore any (possibly stale) error state.
const bool check_error_state = false;
@@ -369,6 +373,7 @@ void NetworkConnectImpl::ConfigureSetProfileSucceeded(
// Public methods
void NetworkConnectImpl::ConnectToNetwork(const std::string& service_path) {
+ LOG(ERROR) << "*** QUICHE: " << __func__;
NET_LOG_USER("ConnectToNetwork", service_path);
const NetworkState* network = GetNetworkState(service_path);
if (network) {
@@ -491,6 +496,7 @@ void NetworkConnectImpl::ConfigureNetworkAndConnect(
const std::string& service_path,
const base::DictionaryValue& properties,
bool shared) {
+ LOG(ERROR) << "*** QUICHE: " << __func__;
NET_LOG_USER("ConfigureNetworkAndConnect", service_path);
scoped_ptr<base::DictionaryValue> properties_to_set(properties.DeepCopy());
@@ -501,6 +507,7 @@ void NetworkConnectImpl::ConfigureNetworkAndConnect(
NetworkConnectionHandler::kErrorConfigureFailed, service_path);
return;
}
+ LOG(ERROR) << "*** QUICHE: " << __func__;
NetworkHandler::Get()->network_configuration_handler()->SetNetworkProfile(
service_path, profile_path,
NetworkConfigurationObserver::SOURCE_USER_ACTION,
@@ -515,12 +522,14 @@ void NetworkConnectImpl::ConfigureNetworkAndConnect(
void NetworkConnectImpl::CreateConfigurationAndConnect(
base::DictionaryValue* properties,
bool shared) {
+ LOG(ERROR) << "*** QUICHE: " << __func__;
NET_LOG_USER("CreateConfigurationAndConnect", "");
CallCreateConfiguration(properties, shared, true /* connect_on_configure */);
}
void NetworkConnectImpl::CreateConfiguration(base::DictionaryValue* properties,
bool shared) {
+ LOG(ERROR) << "*** QUICHE: " << __func__;
NET_LOG_USER("CreateConfiguration", "");
CallCreateConfiguration(properties, shared, false /* connect_on_configure */);
}
« no previous file with comments | « extensions/shell/browser/shell_network_controller_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698