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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura_shell/modal_container_layout_manager.cc

Issue 8771015: Rename Desktop->RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 | « ui/aura_shell/examples/window_type_launcher.cc ('k') | ui/aura_shell/modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/modal_container_layout_manager.cc
===================================================================
--- ui/aura_shell/modal_container_layout_manager.cc (revision 113260)
+++ ui/aura_shell/modal_container_layout_manager.cc (working copy)
@@ -6,8 +6,8 @@
#include "base/bind.h"
#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/desktop.h"
#include "ui/aura/event.h"
+#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/aura_shell/modality_event_filter.h"
#include "ui/aura_shell/shell.h"
@@ -166,7 +166,7 @@
modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f);
modal_screen_->GetNativeView()->layer()->GetAnimator()->AddObserver(this);
- Shell::GetInstance()->AddDesktopEventFilter(modality_filter_.get());
+ Shell::GetInstance()->AddRootWindowEventFilter(modality_filter_.get());
ui::LayerAnimator::ScopedSettings settings(
modal_screen_->GetNativeView()->layer()->GetAnimator());
@@ -182,7 +182,7 @@
}
void ModalContainerLayoutManager::HideModalScreen() {
- Shell::GetInstance()->RemoveDesktopEventFilter(modality_filter_.get());
+ Shell::GetInstance()->RemoveRootWindowEventFilter(modality_filter_.get());
ui::LayerAnimator::ScopedSettings settings(
modal_screen_->GetNativeView()->layer()->GetAnimator());
modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f);
« no previous file with comments | « ui/aura_shell/examples/window_type_launcher.cc ('k') | ui/aura_shell/modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698