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 "ui/aura/root_window.h" | 9 #include "ui/aura/root_window.h" |
10 | 10 |
(...skipping 18 matching lines...) Expand all Loading... |
29 } | 29 } |
30 | 30 |
31 return false; | 31 return false; |
32 } | 32 } |
33 | 33 |
34 bool IsNativeWindowInAsh(gfx::NativeWindow native_window) { | 34 bool IsNativeWindowInAsh(gfx::NativeWindow native_window) { |
35 return IsNativeViewInAsh(native_window); | 35 return IsNativeViewInAsh(native_window); |
36 } | 36 } |
37 | 37 |
38 void ToggleAshDesktop() { | 38 void ToggleAshDesktop() { |
| 39 // TODO(scottmg): Probably need to force Ash here. http://crbug.com/133312 |
39 if (!ash::Shell::HasInstance()) | 40 if (!ash::Shell::HasInstance()) |
40 OpenAsh(); | 41 OpenAsh(); |
41 else | 42 else |
42 CloseAsh(); | 43 CloseAsh(); |
43 } | 44 } |
44 | 45 |
45 } // namespace chrome | 46 } // namespace chrome |
OLD | NEW |