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

Unified Diff: ash/wm/window_util.cc

Issue 9702054: Revert 126764 - Added notion of currently active app / browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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: ash/wm/window_util.cc
===================================================================
--- ash/wm/window_util.cc (revision 126791)
+++ ash/wm/window_util.cc (working copy)
@@ -22,26 +22,17 @@
namespace wm {
void ActivateWindow(aura::Window* window) {
- DCHECK(window);
- DCHECK(window->GetRootWindow());
- aura::client::GetActivationClient(window->GetRootWindow())->ActivateWindow(
+ aura::client::GetActivationClient(Shell::GetRootWindow())->ActivateWindow(
window);
}
void DeactivateWindow(aura::Window* window) {
- DCHECK(window);
- DCHECK(window->GetRootWindow());
- aura::client::GetActivationClient(window->GetRootWindow())->DeactivateWindow(
+ aura::client::GetActivationClient(Shell::GetRootWindow())->DeactivateWindow(
window);
}
bool IsActiveWindow(aura::Window* window) {
- DCHECK(window);
- if (!window->GetRootWindow())
- return false;
-
- return aura::client::GetActivationClient(window->GetRootWindow())->
- GetActiveWindow() == window;
+ return GetActiveWindow() == window;
}
aura::Window* GetActiveWindow() {
« no previous file with comments | « ash/wm/activation_controller_unittest.cc ('k') | chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698