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

ash/system/chromeos/tray_display.cc

Index: ash/system/chromeos/tray_display.cc
diff --git a/ash/system/tray_display.cc b/ash/system/chromeos/tray_display.cc
similarity index 95%
rename from ash/system/tray_display.cc
rename to ash/system/chromeos/tray_display.cc
index 66c99526b59cb10a732211a1a2a3c27ee25b2b92..0e672d1d5a663fa52b87bcba1d99952219b0f8a4 100644
--- a/ash/system/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/tray_display.h"
+#include "ash/system/chromeos/tray_display.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_ash.h"
@@ -53,7 +53,6 @@ class DisplayView : public ash::internal::ActionableView {
   virtual ~DisplayView() {}
 
   void Update() {
-#if defined(OS_CHROMEOS)
     switch (Shell::GetInstance()->output_configurator()->output_state()) {
       case chromeos::STATE_INVALID:
       case chromeos::STATE_HEADLESS:
@@ -97,7 +96,6 @@ class DisplayView : public ash::internal::ActionableView {
       default:
         NOTREACHED();
     }
-#endif  // OS_CHROMEOS
   }
 
  private:
@@ -121,22 +119,16 @@ class DisplayView : public ash::internal::ActionableView {
 TrayDisplay::TrayDisplay()
     : default_(NULL) {
   aura::Env::GetInstance()->display_manager()->AddObserver(this);
-#if defined(OS_CHROMEOS)
   ash::Shell::GetInstance()->output_configurator()->AddObserver(this);
-#endif
 }
 
 TrayDisplay::~TrayDisplay() {
   aura::Env::GetInstance()->display_manager()->RemoveObserver(this);
-#if defined(OS_CHROMEOS)
   ash::Shell::GetInstance()->output_configurator()->RemoveObserver(this);
-#endif
 }
 
 views::View* TrayDisplay::CreateDefaultView(user::LoginStatus status) {
-#if defined(OS_CHROMEOS)
   default_ = new DisplayView(status);
-#endif
   return default_;
 }
 
@@ -159,13 +151,10 @@ void TrayDisplay::OnDisplayRemoved(const gfx::Display& old_display) {
     default_->Update();
 }
 
-#if defined(OS_CHROMEOS)
 void TrayDisplay::OnDisplayModeChanged() {
   if (default_)
     default_->Update();
 }
-#endif
-
 
 }  // namespace internal
 }  // namespace ash