diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 02:09:16 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 02:09:16 +0000 |
| commit | 65d12044f78bd469b507d89703bd3067267a94b3 (patch) | |
| tree | 8e64faef3eeaac14d35c1fa19996bf0cdfb2aaf2 /chrome/browser/platform_util_aura.cc | |
| parent | 256f4bd66fd000e2414495fc12c8d7a6152ab003 (diff) | |
| download | chromium_src-65d12044f78bd469b507d89703bd3067267a94b3.zip chromium_src-65d12044f78bd469b507d89703bd3067267a94b3.tar.gz chromium_src-65d12044f78bd469b507d89703bd3067267a94b3.tar.bz2 | |
Work on USE_ASH/USE_AURA split.
This reduced link errors in the chrome binary down to roughly ten.
- Supplies an X11 implementation of parts of gfx::Screen.
- Multiple files renamed from _aura.cc to _ash.cc or placed outside of ash only directories.
- Some random usage #ifdefed properly.
BUG=116458
TEST=Everything still compiles in all different configurations.
Review URL: http://codereview.chromium.org/10020048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/platform_util_aura.cc')
| -rw-r--r-- | chrome/browser/platform_util_aura.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/chrome/browser/platform_util_aura.cc b/chrome/browser/platform_util_aura.cc index 0bafa3a..c56591f 100644 --- a/chrome/browser/platform_util_aura.cc +++ b/chrome/browser/platform_util_aura.cc @@ -4,10 +4,13 @@ #include "chrome/browser/platform_util.h" -#include "ash/wm/window_util.h" #include "base/logging.h" #include "ui/aura/window.h" +#if defined(USE_ASH) +#include "ash/wm/window_util.h" +#endif + namespace platform_util { gfx::NativeWindow GetTopLevel(gfx::NativeView view) { @@ -19,11 +22,20 @@ gfx::NativeView GetParent(gfx::NativeView view) { } bool IsWindowActive(gfx::NativeWindow window) { +#if defined(USE_ASH) return ash::wm::IsActiveWindow(window); +#else + NOTIMPLEMENTED(); + return false; +#endif } void ActivateWindow(gfx::NativeWindow window) { +#if defined(USE_ASH) ash::wm::ActivateWindow(window); +#else + NOTIMPLEMENTED(); +#endif } bool IsVisible(gfx::NativeView view) { |