Remove OS_CHROMEOS from ui/ash code

chrome/browser/ui/ash/ash_util.cc

Index: chrome/browser/ui/ash/ash_util.cc
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index ee36f53dc6b65b74221460487ccc1f3d0303cf1c..4476c8e0112f0821ab4d9a980e8180add8f7b332 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -17,15 +17,11 @@
 namespace chrome {
 
 bool ShouldOpenAshOnStartup() {
-#if defined(OS_CHROMEOS)
   return !IsRunningInMash();
-#else
-  return false;
-#endif
 }
 
 bool IsRunningInMash() {
-#if defined(OS_CHROMEOS) && defined(MOJO_SHELL_CLIENT)
+#if defined(MOJO_SHELL_CLIENT)
   return content::MojoShellConnection::Get() &&
          content::MojoShellConnection::Get()->UsingExternalShell();
 #else
@@ -33,31 +29,6 @@ bool IsRunningInMash() {
 #endif
 }
 
-bool IsNativeViewInAsh(gfx::NativeView native_view) {
-#if defined(OS_CHROMEOS)
-  // Optimization. There is only ash on ChromeOS.
-  return true;
-#endif
-
-  if (!ash::Shell::HasInstance())
-    return false;
-
-  aura::Window::Windows root_windows =
-      ash::Shell::GetInstance()->GetAllRootWindows();
-
-  for (aura::Window::Windows::const_iterator it = root_windows.begin();
-       it != root_windows.end(); ++it) {
-    if ((*it)->Contains(native_view))
-      return true;
-  }
-
-  return false;
-}
-
-bool IsNativeWindowInAsh(gfx::NativeWindow native_window) {
-  return IsNativeViewInAsh(native_window);
-}
-
 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {
   // When running in mash the browser doesn't handle ash accelerators.
   if (chrome::IsRunningInMash())