Remove OS_CHROMEOS from ui/ash code

chrome/browser/ui/ash/ash_init.cc

Index: chrome/browser/ui/ash/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index 8b4add83409f43aa40ea6fd9325a9f7676b814b1..0ceb1aa4dc7a582ca5e223c940910e2cdac51dcd 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -12,29 +12,29 @@
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "base/command_line.h"
+#include "base/sys_info.h"
 #include "build/build_config.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/browser_shutdown.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
+#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/ash/chrome_screenshot_grabber.h"
 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
+#include "chrome/browser/ui/ash/ime_controller_chromeos.h"
+#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/common/chrome_switches.h"
+#include "chromeos/accelerometer/accelerometer_reader.h"
+#include "chromeos/chromeos_switches.h"
+#include "chromeos/login/login_state.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/context_factory.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 
-#if defined(OS_CHROMEOS)
-#include "base/sys_info.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
-#include "chrome/browser/ui/ash/ime_controller_chromeos.h"
-#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
-#include "chromeos/accelerometer/accelerometer_reader.h"
-#include "chromeos/chromeos_switches.h"
-#include "chromeos/login/login_state.h"
+#if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 
@@ -45,7 +45,6 @@
 namespace chrome {
 
 void OpenAsh(gfx::AcceleratedWidget remote_window) {
-#if defined(OS_CHROMEOS)
 #if defined(USE_X11)
   if (base::SysInfo::IsRunningOnChromeOS()) {
     // Hides the cursor outside of the Aura root window. The cursor will be
@@ -58,7 +57,6 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
   // Hide the mouse cursor completely at boot.
   if (!chromeos::LoginState::Get()->IsUserLoggedIn())
     ash::Shell::set_initially_hide_cursor(true);
-#endif
 
   // Balanced by a call to DestroyInstance() in CloseAsh() below.
   ash::ShellContentState::SetInstance(new ChromeShellContentState);
@@ -68,14 +66,10 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
   shell_init_params.delegate = new ChromeShellDelegate;
   shell_init_params.context_factory = content::GetContextFactory();
   shell_init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
-#if defined(OS_WIN)
-  shell_init_params.remote_hwnd = remote_window;
-#endif
 
   ash::Shell* shell = ash::Shell::CreateInstance(shell_init_params);
   shell->accelerator_controller()->SetScreenshotDelegate(
       std::unique_ptr<ash::ScreenshotDelegate>(new ChromeScreenshotGrabber));
-#if defined(OS_CHROMEOS)
   // TODO(flackr): Investigate exposing a blocking pool task runner to chromeos.
   chromeos::AccelerometerReader::GetInstance()->Initialize(
       content::BrowserThread::GetBlockingPool()
@@ -101,7 +95,6 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
           switches::kDisableZeroBrowsersOpenForTests)) {
     g_browser_process->platform_part()->RegisterKeepAlive();
   }
-#endif
   ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 }