Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / ash_util.cc

diff --git a/src/chrome/browser/ui/ash/ash_util.cc b/src/chrome/browser/ui/ash/ash_util.cc
index f2670de..de8b919 100644 (file)
--- a/src/chrome/browser/ui/ash/ash_util.cc
+++ b/src/chrome/browser/ui/ash/ash_util.cc
@@ -13,8 +13,8 @@ namespace chrome {
 
 bool IsNativeViewInAsh(gfx::NativeView native_view) {
 #if defined(OS_CHROMEOS)
-  // Optimization. There is only ash on ChromeOS.
-  return true;
+  // Optimization. There is only ash or only athena on ChromeOS.
+  return ash::Shell::HasInstance();
 #endif
 
   if (!ash::Shell::HasInstance())
@@ -36,14 +36,4 @@ bool IsNativeWindowInAsh(gfx::NativeWindow native_window) {
   return IsNativeViewInAsh(native_window);
 }
 
-void ToggleAshDesktop() {
-  if (chrome::HOST_DESKTOP_TYPE_ASH == chrome::HOST_DESKTOP_TYPE_NATIVE)
-    return;
-
-  if (!ash::Shell::HasInstance())
-    OpenAsh(gfx::kNullAcceleratedWidget);
-  else
-    CloseAsh();
-}
-
 }  // namespace chrome