| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/ash_util.h" | 5 #include "chrome/browser/ui/ash/ash_util.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "chrome/browser/ui/ash/ash_init.h" | 8 #include "chrome/browser/ui/ash/ash_init.h" |
| 9 #include "chrome/browser/ui/host_desktop.h" | 9 #include "chrome/browser/ui/host_desktop.h" |
| 10 #include "ui/aura/window_event_dispatcher.h" | 10 #include "ui/aura/window_event_dispatcher.h" |
| 11 | 11 |
| 12 namespace chrome { | 12 namespace chrome { |
| 13 | 13 |
| 14 bool IsNativeViewInAsh(gfx::NativeView native_view) { | 14 bool IsNativeViewInAsh(gfx::NativeView native_view) { |
| 15 #if defined(OS_CHROMEOS) | 15 #if defined(OS_CHROMEOS) |
| 16 // Optimization. There is only ash on ChromeOS. | 16 // Optimization. There is only ash or only athena on ChromeOS. |
| 17 return true; | 17 return ash::Shell::HasInstance(); |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 if (!ash::Shell::HasInstance()) | 20 if (!ash::Shell::HasInstance()) |
| 21 return false; | 21 return false; |
| 22 | 22 |
| 23 aura::Window::Windows root_windows = | 23 aura::Window::Windows root_windows = |
| 24 ash::Shell::GetInstance()->GetAllRootWindows(); | 24 ash::Shell::GetInstance()->GetAllRootWindows(); |
| 25 | 25 |
| 26 for (aura::Window::Windows::const_iterator it = root_windows.begin(); | 26 for (aura::Window::Windows::const_iterator it = root_windows.begin(); |
| 27 it != root_windows.end(); ++it) { | 27 it != root_windows.end(); ++it) { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 40 if (chrome::HOST_DESKTOP_TYPE_ASH == chrome::HOST_DESKTOP_TYPE_NATIVE) | 40 if (chrome::HOST_DESKTOP_TYPE_ASH == chrome::HOST_DESKTOP_TYPE_NATIVE) |
| 41 return; | 41 return; |
| 42 | 42 |
| 43 if (!ash::Shell::HasInstance()) | 43 if (!ash::Shell::HasInstance()) |
| 44 OpenAsh(gfx::kNullAcceleratedWidget); | 44 OpenAsh(gfx::kNullAcceleratedWidget); |
| 45 else | 45 else |
| 46 CloseAsh(); | 46 CloseAsh(); |
| 47 } | 47 } |
| 48 | 48 |
| 49 } // namespace chrome | 49 } // namespace chrome |
| OLD | NEW |