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/platform_util.h" | 5 #include "chrome/browser/platform_util.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" |
9 #include "ui/wm/core/window_util.h" | |
9 | 10 |
10 #if defined(USE_ASH) | 11 #if defined(USE_ASH) |
11 #include "ash/wm/window_util.h" | 12 #include "ash/wm/window_util.h" |
12 #endif | 13 #endif |
13 | 14 |
14 namespace platform_util { | 15 namespace platform_util { |
15 | 16 |
16 gfx::NativeWindow GetTopLevel(gfx::NativeView view) { | 17 gfx::NativeWindow GetTopLevel(gfx::NativeView view) { |
17 return view->GetToplevelWindow(); | 18 return view->GetToplevelWindow(); |
18 } | 19 } |
19 | 20 |
20 gfx::NativeView GetViewForWindow(gfx::NativeWindow window) { | 21 gfx::NativeView GetViewForWindow(gfx::NativeWindow window) { |
21 DCHECK(window); | 22 DCHECK(window); |
22 return window; | 23 return window; |
23 } | 24 } |
24 | 25 |
25 gfx::NativeView GetParent(gfx::NativeView view) { | 26 gfx::NativeView GetParent(gfx::NativeView view) { |
26 return view->parent(); | 27 return view->parent(); |
27 } | 28 } |
28 | 29 |
29 bool IsWindowActive(gfx::NativeWindow window) { | 30 bool IsWindowActive(gfx::NativeWindow window) { |
30 #if defined(USE_ASH) | 31 #if defined(USE_ASH) |
sky
2016/02/18 22:15:54
Can you use the non ash:: variants all the time? I
scottmg
2016/02/18 22:20:14
Done. (I didn't remove the ash::wm:: implementatio
| |
31 return ash::wm::IsActiveWindow(window); | 32 return ash::wm::IsActiveWindow(window); |
32 #else | 33 #else |
33 NOTIMPLEMENTED(); | 34 return wm::IsActiveWindow(window); |
34 return false; | |
35 #endif | 35 #endif |
36 } | 36 } |
37 | 37 |
38 void ActivateWindow(gfx::NativeWindow window) { | 38 void ActivateWindow(gfx::NativeWindow window) { |
39 #if defined(USE_ASH) | 39 #if defined(USE_ASH) |
40 ash::wm::ActivateWindow(window); | 40 ash::wm::ActivateWindow(window); |
41 #else | 41 #else |
42 NOTIMPLEMENTED(); | 42 wm::ActivateWindow(window); |
43 #endif | 43 #endif |
44 } | 44 } |
45 | 45 |
46 bool IsVisible(gfx::NativeView view) { | 46 bool IsVisible(gfx::NativeView view) { |
47 return view->IsVisible(); | 47 return view->IsVisible(); |
48 } | 48 } |
49 | 49 |
50 } // namespace platform_util | 50 } // namespace platform_util |
OLD | NEW |