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

ash/system/chromeos/tray_display.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 "ash/system/tray_display.h"
+#include "ash/system/chromeos/tray_display.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_resources.h"
@@ skipping 30 matching lines @@
         bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DISPLAY).ToImageSkia());
     AddChildView(image);
     label_ = new views::Label();
     AddChildView(label_);
     Update();
   }
 
   virtual ~DisplayView() {}
 
   void Update() {
-#if defined(OS_CHROMEOS)
     switch (Shell::GetInstance()->output_configurator()->output_state()) {
       case chromeos::STATE_INVALID:
       case chromeos::STATE_HEADLESS:
       case chromeos::STATE_SINGLE:
         SetVisible(false);
         return;
       case chromeos::STATE_DUAL_MIRROR: {
         // Simply assumes that the primary display appears first and the
         // secondary display appears next in the list.
         std::vector<std::string> display_names;
@@ skipping 23 matching lines @@
                   ScreenAsh::GetSecondaryDisplay()))));
           SetVisible(true);
         } else {
           SetVisible(false);
         }
         return;
       }
       default:
         NOTREACHED();
     }
-#endif  // OS_CHROMEOS
   }
 
  private:
   // Overridden from ActionableView.
   virtual bool PerformAction(const ui::Event& event) OVERRIDE {
     if (login_status_ == ash::user::LOGGED_IN_USER ||
         login_status_ == ash::user::LOGGED_IN_OWNER ||
         login_status_ == ash::user::LOGGED_IN_GUEST) {
       ash::Shell::GetInstance()->tray_delegate()->ShowDisplaySettings();
     }
 
     return true;
   }
 
   user::LoginStatus login_status_;
   views::Label* label_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayView);
 };
 
 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_;
 }
 
 void TrayDisplay::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayDisplay::OnDisplayBoundsChanged(const gfx::Display& display) {
   if (default_)
     default_->Update();
 }
 
 void TrayDisplay::OnDisplayAdded(const gfx::Display& new_display) {
   if (default_)
     default_->Update();
 }
 
 void TrayDisplay::OnDisplayRemoved(const gfx::Display& old_display) {
   if (default_)
     default_->Update();
 }
 
-#if defined(OS_CHROMEOS)
 void TrayDisplay::OnDisplayModeChanged() {
   if (default_)
     default_->Update();
 }
-#endif
-
 
 }  // namespace internal
 }  // namespace ash