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

Unified Diff: chrome/browser/ui/ash/event_rewriter.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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/ui/ash/event_rewriter.cc
diff --git a/chrome/browser/ui/ash/event_rewriter.cc b/chrome/browser/ui/ash/event_rewriter.cc
index 54e808cd1d14dd2d9877219bb8247c7825b8e97c..c28df4f4bf90efae186e149eea79f9cea7c4a73e 100644
--- a/chrome/browser/ui/ash/event_rewriter.cc
+++ b/chrome/browser/ui/ash/event_rewriter.cc
@@ -170,8 +170,10 @@ EventRewriter::EventRewriter()
#endif
pref_service_(NULL) {
// The ash shell isn't instantiated for our unit tests.
- if (ash::Shell::HasInstance())
- ash::Shell::GetPrimaryRootWindow()->AddRootWindowObserver(this);
+ if (ash::Shell::HasInstance()) {
+ ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->
+ AddRootWindowObserver(this);
+ }
#if defined(OS_CHROMEOS)
if (base::SysInfo::IsRunningOnChromeOS()) {
chromeos::XInputHierarchyChangedEventListener::GetInstance()
@@ -182,8 +184,10 @@ EventRewriter::EventRewriter()
}
EventRewriter::~EventRewriter() {
- if (ash::Shell::HasInstance())
- ash::Shell::GetPrimaryRootWindow()->RemoveRootWindowObserver(this);
+ if (ash::Shell::HasInstance()) {
+ ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->
+ RemoveRootWindowObserver(this);
+ }
#if defined(OS_CHROMEOS)
if (base::SysInfo::IsRunningOnChromeOS()) {
chromeos::XInputHierarchyChangedEventListener::GetInstance()
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698