ui/aura_shell/shadow_controller.cc - Issue 8771015: Rename Desktop->RootWindow.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/aura_shell/shadow_controller.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:

Index: ui/aura_shell/shadow_controller.cc

===================================================================

--- ui/aura_shell/shadow_controller.cc (revision 113260)

+++ ui/aura_shell/shadow_controller.cc (working copy)

@@ -9,7 +9,7 @@

#include "base/logging.h"

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/client/shadow_types.h"

-#include "ui/aura/desktop.h"

+#include "ui/aura/root_window.h"

#include "ui/aura/window.h"

#include "ui/aura_shell/shadow.h"

@@ -19,7 +19,7 @@

namespace internal {

ShadowController::ShadowController() {

- aura::Desktop::GetInstance()->AddObserver(this);

+ aura::RootWindow::GetInstance()->AddObserver(this);

}

ShadowController::~ShadowController() {

@@ -27,7 +27,7 @@

it != window_shadows_.end(); ++it) {

it->first->RemoveObserver(this);

}

- aura::Desktop::GetInstance()->RemoveObserver(this);

+ aura::RootWindow::GetInstance()->RemoveObserver(this);

}

void ShadowController::OnWindowInitialized(aura::Window* window) {

« no previous file with comments | « ui/aura_shell/shadow_controller.h ('k') | ui/aura_shell/shadow_controller_unittest.cc » ('j') | no next file with comments »