Allow networkingPrivate to request configure UI

ui/chromeos/network/network_state_notifier.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/chromeos/network/network_state_notifier.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_connection_handler.h"
-#include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/shill_property_util.h"
+#include "components/device_event_log/device_event_log.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/chromeos/network/network_connect.h"
 #include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
 #include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 
 using chromeos::NetworkConnectionHandler;
@@ skipping 33 matching lines @@
 }
 
 int GetErrorNotificationIconId(const std::string& network_type) {
   if (network_type == shill::kTypeVPN)
     return IDR_AURA_UBER_TRAY_NETWORK_VPN;
   if (network_type == shill::kTypeCellular)
     return IDR_AURA_UBER_TRAY_NETWORK_FAILED_CELLULAR;
   return IDR_AURA_UBER_TRAY_NETWORK_FAILED;
 }
 
-void ShowErrorNotification(const std::string& notification_id,
+void ShowErrorNotification(const std::string& service_path,
+                           const std::string& notification_id,
                            const std::string& network_type,
                            const base::string16& title,
                            const base::string16& message,
                            const base::Closure& callback) {
+  NET_LOG(ERROR) << "ShowErrorNotification: " << service_path << ": "
+                 << base::UTF16ToUTF8(title);
   const gfx::Image& icon =
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           GetErrorNotificationIconId(network_type));
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           notification_id, title, message, icon,
           ui::NetworkStateNotifier::kNotifierNetworkError, callback));
 }
 
 }  // namespace
@@ skipping 126 matching lines @@
           ->HasPendingConnectRequest())
     return;
 
   did_show_out_of_credits_ = true;
   base::TimeDelta dtime = base::Time::Now() - out_of_credits_notify_time_;
   if (dtime.InSeconds() > kMinTimeBetweenOutOfCreditsNotifySeconds) {
     out_of_credits_notify_time_ = base::Time::Now();
     base::string16 error_msg = l10n_util::GetStringFUTF16(
         IDS_NETWORK_OUT_OF_CREDITS_BODY, base::UTF8ToUTF16(cellular->name()));
     ShowErrorNotification(
-        kNetworkOutOfCreditsNotificationId, cellular->type(),
+        cellular->path(), kNetworkOutOfCreditsNotificationId, cellular->type(),
         l10n_util::GetStringUTF16(IDS_NETWORK_OUT_OF_CREDITS_TITLE), error_msg,
         base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
                    weak_ptr_factory_.GetWeakPtr(), cellular->path()));
   }
 }
 
 void NetworkStateNotifier::UpdateCellularActivating(
     const NetworkState* cellular) {
   // Keep track of any activating cellular network.
   std::string activation_state = cellular->activation_state();
@@ skipping 42 matching lines @@
       base::Bind(&NetworkStateNotifier::ConnectErrorPropertiesFailed,
                  weak_ptr_factory_.GetWeakPtr(), error_name, service_path));
 }
 
 void NetworkStateNotifier::ShowMobileActivationError(
     const std::string& service_path) {
   const NetworkState* cellular =
       NetworkHandler::Get()->network_state_handler()->GetNetworkState(
           service_path);
   if (!cellular || cellular->type() != shill::kTypeCellular) {
-    NET_LOG_ERROR("ShowMobileActivationError without Cellular network",
-                  service_path);
+    NET_LOG(ERROR) << "ShowMobileActivationError without Cellular network: "
+                   << service_path;
     return;
   }
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           kNetworkActivateNotificationId,
           l10n_util::GetStringUTF16(IDS_NETWORK_ACTIVATION_ERROR_TITLE),
           l10n_util::GetStringFUTF16(IDS_NETWORK_ACTIVATION_NEEDS_CONNECTION,
                                      base::UTF8ToUTF16(cellular->name())),
           ui::ResourceBundle::GetSharedInstance().GetImageNamed(
               IDR_AURA_UBER_TRAY_NETWORK_FAILED_CELLULAR),
@@ skipping 33 matching lines @@
     scoped_ptr<base::DictionaryValue> shill_error_data) {
   base::DictionaryValue shill_properties;
   ShowConnectErrorNotification(error_name, service_path, shill_properties);
 }
 
 void NetworkStateNotifier::ShowConnectErrorNotification(
     const std::string& error_name,
     const std::string& service_path,
     const base::DictionaryValue& shill_properties) {
   base::string16 error = GetConnectErrorString(error_name);
+  NET_LOG(DEBUG) << "Notify: " << service_path
+                 << ": Connect error: " << error_name << ": "
+                 << base::UTF16ToUTF8(error);
   if (error.empty()) {
     std::string shill_error;
     shill_properties.GetStringWithoutPathExpansion(shill::kErrorProperty,
                                                    &shill_error);
     if (!chromeos::NetworkState::ErrorIsValid(shill_error)) {
       shill_properties.GetStringWithoutPathExpansion(
           shill::kPreviousErrorProperty, &shill_error);
-      NET_LOG_DEBUG("Notify Service.PreviousError: " + shill_error,
-                    service_path);
+      NET_LOG(DEBUG) << "Notify: " << service_path
+                     << ": Service.PreviousError: " << shill_error;
       if (!chromeos::NetworkState::ErrorIsValid(shill_error))
         shill_error.clear();
     } else {
-      NET_LOG_DEBUG("Notify Service.Error: " + shill_error, service_path);
+      NET_LOG(DEBUG) << "Notify: " << service_path
+                     << ": Service.Error: " << shill_error;
     }
 
     const NetworkState* network =
         NetworkHandler::Get()->network_state_handler()->GetNetworkState(
             service_path);
     if (network) {
       // Always log last_error, but only use it if shill_error is empty.
       // TODO(stevenjb): This shouldn't ever be necessary, but is kept here as
       // a failsafe since more information is better than less when debugging
       // and we have encountered some strange edge cases before.
-      NET_LOG_DEBUG("Notify Network.last_error: " + network->last_error(),
-                    service_path);
+      NET_LOG(DEBUG) << "Notify: " << service_path
+                     << ": Network.last_error: " << network->last_error();
       if (shill_error.empty())
         shill_error = network->last_error();
     }
 
     if (ShillErrorIsIgnored(shill_error)) {
-      NET_LOG_DEBUG("Notify Ignoring error: " + error_name, service_path);
+      NET_LOG(DEBUG) << "Notify: " << service_path
+                     << ": Ignoring error: " << error_name;
       return;
     }
 
     error = network_connect_->GetShillErrorString(shill_error, service_path);
-    if (error.empty())
+    if (error.empty()) {
+      if (error_name == NetworkConnectionHandler::kErrorConnectFailed &&
+          network && !network->connectable()) {
+        // Connect failure on non connectable network with no additional
+        // information. We expect the UI to show configuration UI so do not
+        // show an additional (and unhelpful) notification.
+        return;
+      }
       error = l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN);
+    }
   }
-  NET_LOG_ERROR("Notify connect error: " + base::UTF16ToUTF8(error),
-                service_path);
+  NET_LOG(ERROR) << "Notify: " << service_path
+                 << ": Connect error: " + base::UTF16ToUTF8(error);
 
   std::string network_name =
       chromeos::shill_property_util::GetNameFromProperties(service_path,
                                                            shill_properties);
   std::string network_error_details;
   shill_properties.GetStringWithoutPathExpansion(shill::kErrorDetailsProperty,
                                                  &network_error_details);
 
   base::string16 error_msg;
   if (!network_error_details.empty()) {
     // network_name should't be empty if network_error_details is set.
     error_msg = l10n_util::GetStringFUTF16(
         IDS_NETWORK_CONNECTION_ERROR_MESSAGE_WITH_SERVER_MESSAGE,
         base::UTF8ToUTF16(network_name), error,
         base::UTF8ToUTF16(network_error_details));
   } else if (network_name.empty()) {
     error_msg = l10n_util::GetStringFUTF16(
         IDS_NETWORK_CONNECTION_ERROR_MESSAGE_NO_NAME, error);
   } else {
     error_msg =
         l10n_util::GetStringFUTF16(IDS_NETWORK_CONNECTION_ERROR_MESSAGE,
                                    base::UTF8ToUTF16(network_name), error);
   }
 
   std::string network_type;
   shill_properties.GetStringWithoutPathExpansion(shill::kTypeProperty,
                                                  &network_type);
 
   ShowErrorNotification(
-      kNetworkConnectNotificationId, network_type,
+      service_path, kNetworkConnectNotificationId, network_type,
       l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE), error_msg,
       base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
                  weak_ptr_factory_.GetWeakPtr(), service_path));
 }
 
 void NetworkStateNotifier::ShowVpnDisconnectedNotification(
     const NetworkState* vpn) {
   base::string16 error_msg = l10n_util::GetStringFUTF16(
       IDS_NETWORK_VPN_CONNECTION_LOST_BODY, base::UTF8ToUTF16(vpn->name()));
   ShowErrorNotification(
-      kNetworkConnectNotificationId, shill::kTypeVPN,
+      vpn->path(), kNetworkConnectNotificationId, shill::kTypeVPN,
       l10n_util::GetStringUTF16(IDS_NETWORK_VPN_CONNECTION_LOST_TITLE),
       error_msg, base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
                             weak_ptr_factory_.GetWeakPtr(), vpn->path()));
 }
 
 void NetworkStateNotifier::ShowNetworkSettingsForPath(
     const std::string& service_path) {
   network_connect_->ShowNetworkSettingsForPath(service_path);
 }
 
 }  // namespace ui