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

Unified Diff: chrome/browser/ui/views/aura/screen_orientation_listener.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
Index: chrome/browser/ui/views/aura/screen_orientation_listener.cc
===================================================================
--- chrome/browser/ui/views/aura/screen_orientation_listener.cc (revision 113260)
+++ chrome/browser/ui/views/aura/screen_orientation_listener.cc (working copy)
@@ -6,7 +6,7 @@
#include "base/memory/scoped_ptr.h"
#include "content/browser/sensors/sensors_provider.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
#include "ui/gfx/compositor/layer.h"
#include "ui/gfx/compositor/layer_animation_sequence.h"
#include "ui/gfx/compositor/layer_animator.h"
@@ -43,10 +43,11 @@
content::ScreenOrientation change) {
ui::Layer* to_rotate = NULL;
ui::LayerAnimationObserver* observer = NULL;
- // Desktop is initialized before the listener, so this will not return NULL.
- aura::Desktop* aura_desktop = aura::Desktop::GetInstance();
- to_rotate = aura_desktop->layer();
- observer = aura_desktop;
+ // RootWindow is initialized before the listener, so this will not return
+ // NULL.
+ aura::RootWindow* root_window = aura::RootWindow::GetInstance();
+ to_rotate = root_window->layer();
+ observer = root_window;
if (!to_rotate)
return;

Powered by Google App Engine
This is Rietveld 408576698