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

Unified Diff: ash/system/chromeos/tray_display.h

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase Created 8 years, 1 month 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 | « ash/shell.cc ('k') | ash/system/chromeos/tray_display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/tray_display.h
diff --git a/ash/system/chromeos/tray_display.h b/ash/system/chromeos/tray_display.h
index 77994b62b2cfd8750325cffb66c8416bd0b89785..0685a9de29dc3c50e2b5e44f3c86256a80ad8532 100644
--- a/ash/system/chromeos/tray_display.h
+++ b/ash/system/chromeos/tray_display.h
@@ -7,7 +7,7 @@
#include "ash/system/tray/system_tray_item.h"
#include "base/memory/scoped_ptr.h"
-#include "ui/aura/display_observer.h"
+#include "ui/gfx/display_observer.h"
#include "chromeos/display/output_configurator.h"
@@ -22,7 +22,7 @@ class DisplayView;
class TrayDisplay : public SystemTrayItem,
public chromeos::OutputConfigurator::Observer,
- public aura::DisplayObserver {
+ public gfx::DisplayObserver {
public:
TrayDisplay();
virtual ~TrayDisplay();
« no previous file with comments | « ash/shell.cc ('k') | ash/system/chromeos/tray_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698