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

Unified Diff: chrome/browser/platform_util_aura.cc

Issue 1711113002: Fix hung renderer dialog not showing after setting USE_ASH=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no need for ash::wm Created 4 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/platform_util_aura.cc
diff --git a/chrome/browser/platform_util_aura.cc b/chrome/browser/platform_util_aura.cc
index db3a343893373b0ddca83fbdbbe1d47a4cbffbc3..16c3e2b80eca333a35b59413640e92106e472ffc 100644
--- a/chrome/browser/platform_util_aura.cc
+++ b/chrome/browser/platform_util_aura.cc
@@ -6,10 +6,7 @@
#include "base/logging.h"
#include "ui/aura/window.h"
-
-#if defined(USE_ASH)
-#include "ash/wm/window_util.h"
-#endif
+#include "ui/wm/core/window_util.h"
namespace platform_util {
@@ -27,20 +24,11 @@ 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
+ return wm::IsActiveWindow(window);
}
void ActivateWindow(gfx::NativeWindow window) {
-#if defined(USE_ASH)
- ash::wm::ActivateWindow(window);
-#else
- NOTIMPLEMENTED();
-#endif
+ wm::ActivateWindow(window);
}
bool IsVisible(gfx::NativeView view) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698