Move tray code from ui/chromeos/network/

chrome/browser/chromeos/status/data_promo_notification.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/status/data_promo_notification.h"
 
 #include "ash/common/system/system_notifier.h"
+#include "ash/resources/grit/ash_resources.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/chromeos/net/network_state_notifier.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 11 matching lines @@
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/browser/extension_registry.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"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
 
 namespace {
 
 const char kDataPromoNotificationId[] = "chrome://settings/internet/data_promo";
@@ skipping 204 matching lines @@
     message = base::UTF8ToUTF16(deal_text + "\n\n") + message;
     info_url = deal->info_url();
     if (info_url.empty() && carrier)
       info_url = carrier->top_up_url();
   } else if (data_saver_prompt_shown || !ShouldShow3gPromoNotification()) {
     return;
   }
 
   int icon_id;
   if (default_network->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(
           kDataPromoNotificationId, base::string16() /* title */, message, icon,
           ash::system_notifier::kNotifierNetwork,
           base::Bind(&NotificationClicked, default_network->guid(), info_url)));
 
   SetShow3gPromoNotification(false);
@@ skipping 18 matching lines @@
                              extensions::ExtensionRegistry::EVERYTHING)) {
     // If extension is installed, disable future prompts.
     SetDataSaverPromptsShown(kTimesToShowDataSaverPrompt);
     return false;
   }
 
   base::string16 title = l10n_util::GetStringUTF16(IDS_3G_DATASAVER_TITLE);
   base::string16 message = l10n_util::GetStringUTF16(IDS_3G_DATASAVER_MESSAGE);
   const gfx::Image& icon =
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-          IDR_AURA_UBER_TRAY_NOTIFICATION_DATASAVER);
+          IDR_AURA_UBER_TRAY_NETWORK_NOTIFICATION_DATASAVER);
 
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           kDataSaverNotificationId, title, message, icon,
           ash::system_notifier::kNotifierNetwork,
           base::Bind(&NotificationClicked, "", kDataSaverExtensionUrl)));
   content::RecordAction(base::UserMetricsAction("DataSaverPrompt_Shown"));
 
   if (DataSaverSwitchDemoMode()) {
     SetDataSaverPromptsShown(0);  // demo mode resets times shown counts.
     SetShow3gPromoNotification(true);
   } else {
     SetDataSaverPromptsShown(times_shown + 1);
   }
 
   return true;
 }
 
 }  // namespace chromeos