From 65d12044f78bd469b507d89703bd3067267a94b3 Mon Sep 17 00:00:00 2001
From: "erg@chromium.org"
<erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 12 Apr 2012 02:09:16 +0000
Subject: 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
---
chrome/browser/platform_util_aura.cc | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
(limited to 'chrome/browser/platform_util_aura.cc')
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) {
--
cgit v1.1