Move tray code from ui/chromeos/network/

chrome/browser/chromeos/net/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 "chrome/browser/chromeos/net/network_state_notifier.h"
 
 #include "ash/common/system/system_notifier.h"
+#include "ash/resources/grit/ash_resources.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 "chrome/browser/chromeos/net/shill_error.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_connection_handler.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/resources/grit/ui_chromeos_resources.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 
 namespace chromeos {
 
 namespace {
 
 const int kMinTimeBetweenOutOfCreditsNotifySeconds = 10 * 60;
 
 // Ignore in-progress error.
@@ skipping 203 matching lines @@
   }
   // Only display a notification if this network was activating and is now
   // activated.
   if (!cellular_activating_.count(cellular->path()) ||
       activation_state != shill::kActivationStateActivated)
     return;
 
   cellular_activating_.erase(cellular->path());
   int icon_id;
   if (cellular->network_technology() == shill::kNetworkTechnologyLte)
-    icon_id = IDR_AURA_UBER_TRAY_NOTIFICATION_LTE;
+    icon_id = IDR_AURA_UBER_TRAY_NETWORK_NOTIFICATION_LTE;
   else
-    icon_id = IDR_AURA_UBER_TRAY_NOTIFICATION_3G;
+    icon_id = IDR_AURA_UBER_TRAY_NETWORK_NOTIFICATION_3G;
   const gfx::Image& icon =
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(icon_id);
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           kNetworkActivateNotificationId,
           l10n_util::GetStringUTF16(IDS_NETWORK_CELLULAR_ACTIVATED_TITLE),
           l10n_util::GetStringFUTF16(IDS_NETWORK_CELLULAR_ACTIVATED,
                                      base::UTF8ToUTF16((cellular->name()))),
           icon, ash::system_notifier::kNotifierNetwork,
           base::Bind(&NetworkStateNotifier::ShowNetworkSettings,
@@ skipping 178 matching lines @@
                             weak_ptr_factory_.GetWeakPtr(), vpn->guid()));
 }
 
 void NetworkStateNotifier::ShowNetworkSettings(const std::string& network_id) {
   if (!SystemTrayClient::Get())
     return;
   SystemTrayClient::Get()->ShowNetworkSettings(network_id);
 }
 
 }  // namespace chromeos