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

ash/system/chromeos/tray_display.h

Index: ash/system/chromeos/tray_display.h
diff --git a/ash/system/tray_display.h b/ash/system/chromeos/tray_display.h
similarity index 86%
rename from ash/system/tray_display.h
rename to ash/system/chromeos/tray_display.h
index e969e76b8a40a0c887f4b5e56082425959b1eda2..77994b62b2cfd8750325cffb66c8416bd0b89785 100644
--- a/ash/system/tray_display.h
+++ b/ash/system/chromeos/tray_display.h
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_TRAY_DISPLAY_H_
-#define ASH_SYSTEM_TRAY_DISPLAY_H_
+#ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
+#define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
 
 #include "ash/system/tray/system_tray_item.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/display_observer.h"
 
-#if defined(OS_CHROMEOS)
 #include "chromeos/display/output_configurator.h"
-#endif
 
 namespace views {
 class View;
@@ -23,9 +21,7 @@ namespace internal {
 class DisplayView;
 
 class TrayDisplay : public SystemTrayItem,
-#if defined(OS_CHROMEOS)
                     public chromeos::OutputConfigurator::Observer,
-#endif
                     public aura::DisplayObserver {
  public:
   TrayDisplay();
@@ -41,10 +37,8 @@ class TrayDisplay : public SystemTrayItem,
   virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
   virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
 
-#if defined(OS_CHROMEOS)
   // Overridden from chromeos::OutputConfigurator::Observer
   virtual void OnDisplayModeChanged() OVERRIDE;
-#endif
 
   DisplayView* default_;
 
@@ -54,4 +48,4 @@ class TrayDisplay : public SystemTrayItem,
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_TRAY_DISPLAY_H_
+#endif  // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_