Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7704)

Unified Diff: chrome/browser/platform_util_aura.cc

Issue 10020048: Work on USE_ASH/USE_AURA split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/platform_util_aura.cc
diff --git a/chrome/browser/platform_util_aura.cc b/chrome/browser/platform_util_aura.cc
index 0bafa3aa3e1ff8b910e033c7d8b259acee337c65..c56591f0a2c97a406b972bead2b1d5717637f569 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) {
« no previous file with comments | « chrome/browser/pepper_gtalk_message_filter.cc ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698