Move ash/system/network to ash/system/chromeos

ash/system/tray/system_tray.cc

Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index f23c44688842bd022bc8033bd289774e44ff3606..bcfa5d7d4fd062b12672b0eeaa6ea9deeee380a0 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -14,8 +14,6 @@
 #include "ash/system/drive/tray_drive.h"
 #include "ash/system/ime/tray_ime.h"
 #include "ash/system/locale/tray_locale.h"
-#include "ash/system/network/tray_network.h"
-#include "ash/system/network/tray_sms.h"
 #include "ash/system/power/power_status_observer.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/power/tray_power.h"
@@ -49,6 +47,11 @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/system/chromeos/network/tray_network.h"
+#include "ash/system/chromeos/network/tray_sms.h"
+#endif
+
 namespace ash {
 
 // SystemTray
@@ -68,7 +71,10 @@ SystemTray::SystemTray(internal::StatusAreaWidget* status_area_widget)
       drive_observer_(NULL),
       ime_observer_(NULL),
       locale_observer_(NULL),
+#if defined(OS_CHROMEOS)
       network_observer_(NULL),
+      sms_observer_(NULL),
+#endif
       update_observer_(NULL),
       user_observer_(NULL),
       default_bubble_height_(0),
@@ -91,8 +97,6 @@ void SystemTray::CreateItems() {
   internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
   internal::TrayDate* tray_date = new internal::TrayDate();
   internal::TrayPower* tray_power = new internal::TrayPower();
-  internal::TrayNetwork* tray_network = new internal::TrayNetwork;
-  internal::TraySms* tray_sms = new internal::TraySms();
   internal::TrayUser* tray_user = new internal::TrayUser;
   internal::TrayAccessibility* tray_accessibility =
       new internal::TrayAccessibility;
@@ -113,18 +117,27 @@ void SystemTray::CreateItems() {
   drive_observer_ = tray_drive;
   ime_observer_ = tray_ime;
   locale_observer_ = tray_locale;
-  network_observer_ = tray_network;
   power_status_observers_.AddObserver(tray_power);
   power_status_observers_.AddObserver(tray_settings);
-  sms_observer_ = tray_sms;
   update_observer_ = tray_update;
   user_observer_ = tray_user;
 
+#if defined(OS_CHROMEOS)
+  internal::TrayNetwork* tray_network = new internal::TrayNetwork;
+  internal::TraySms* tray_sms = new internal::TraySms();
+  network_observer_ = tray_network;
+  sms_observer_ = tray_sms;
+#endif
+
   AddTrayItem(tray_user);
   AddTrayItem(tray_power);
+#if defined(OS_CHROMEOS)
   AddTrayItem(tray_network);
+#endif
   AddTrayItem(tray_bluetooth);
+#if defined(OS_CHROMEOS)
   AddTrayItem(tray_sms);
+#endif
   AddTrayItem(tray_drive);
   AddTrayItem(tray_ime);
   AddTrayItem(tray_locale);