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

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: . 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..14b39ce932a5a2e8ae8dd04d17603821dd94c602 100644
--- a/chrome/browser/platform_util_aura.cc
+++ b/chrome/browser/platform_util_aura.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "ui/aura/window.h"
+#include "ui/wm/core/window_util.h"
#if defined(USE_ASH)
#include "ash/wm/window_util.h"
@@ -30,8 +31,7 @@ bool IsWindowActive(gfx::NativeWindow window) {
#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
return ash::wm::IsActiveWindow(window);
#else
- NOTIMPLEMENTED();
- return false;
+ return wm::IsActiveWindow(window);
#endif
}
@@ -39,7 +39,7 @@ void ActivateWindow(gfx::NativeWindow window) {
#if defined(USE_ASH)
ash::wm::ActivateWindow(window);
#else
- NOTIMPLEMENTED();
+ wm::ActivateWindow(window);
#endif
}
« 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