| 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" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 bool IsNativeWindowInAsh(gfx::NativeWindow native_window) { | 35 bool IsNativeWindowInAsh(gfx::NativeWindow native_window) { |
| 36 return IsNativeViewInAsh(native_window); | 36 return IsNativeViewInAsh(native_window); |
| 37 } | 37 } |
| 38 | 38 |
| 39 void ToggleAshDesktop() { | 39 void ToggleAshDesktop() { |
| 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(); | 44 OpenAsh(gfx::kNullAcceleratedWidget); |
| 45 else | 45 else |
| 46 CloseAsh(); | 46 CloseAsh(); |
| 47 } | 47 } |
| 48 | 48 |
| 49 } // namespace chrome | 49 } // namespace chrome |
| OLD | NEW |