Make ChromeOS captive portal notification text same as desktop

chrome/browser/chromeos/net/network_portal_notification_controller.cc

 // Copyright 2014 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 "chrome/browser/chromeos/net/network_portal_notification_controller.h"
 
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/basictypes.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_state.h"
+#include "chromeos/network/network_type_pattern.h"
 #include "components/captive_portal/captive_portal_detector.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/notifier_settings.h"
 #include "ui/views/widget/widget.h"
 
 using message_center::Notification;
@@ skipping 134 matching lines @@
   if (network->path() == last_network_path_)
     return;
   last_network_path_ = network->path();
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   gfx::Image& icon = bundle.GetImageNamed(IDR_PORTAL_DETECTION_ALERT);
   message_center::NotifierId notifier_id(
       message_center::NotifierId::SYSTEM_COMPONENT,
       ash::system_notifier::kNotifierNetworkPortalDetector);
 
+  bool is_wifi = NetworkTypePattern::WiFi().MatchesType(network->type());
   scoped_ptr<Notification> notification(new Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, kNotificationId,
-      l10n_util::GetStringUTF16(IDS_PORTAL_DETECTION_NOTIFICATION_TITLE),
-      l10n_util::GetStringFUTF16(IDS_PORTAL_DETECTION_NOTIFICATION_MESSAGE,
-                                 base::UTF8ToUTF16(network->name())),
+      l10n_util::GetStringUTF16(
+          is_wifi ?
+          IDS_PORTAL_DETECTION_NOTIFICATION_TITLE_WIFI :
+          IDS_PORTAL_DETECTION_NOTIFICATION_TITLE_WIRED),
+      l10n_util::GetStringFUTF16(
+          is_wifi ?
+          IDS_PORTAL_DETECTION_NOTIFICATION_MESSAGE_WIFI :
+          IDS_PORTAL_DETECTION_NOTIFICATION_MESSAGE_WIRED,
+          base::UTF8ToUTF16(network->name())),
       icon, base::string16() /* display_source */, notifier_id,
       message_center::RichNotificationData(),
       new NetworkPortalNotificationControllerDelegate(AsWeakPtr())));
   notification->SetSystemPriority();
 
   if (ash::Shell::HasInstance()) {
     ash::Shell::GetInstance()
         ->system_tray_notifier()
         ->NotifyOnCaptivePortalDetected(network->path());
   }
@@ skipping 13 matching lines @@
 
 void NetworkPortalNotificationController::OnDialogDestroyed(
     const NetworkPortalWebDialog* dialog) {
   if (dialog == dialog_) {
     dialog_ = nullptr;
     ProfileHelper::Get()->ClearSigninProfile(base::Closure());
   }
 }
 
 }  // namespace chromeos