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

Unified Diff: ash/shell.h

Issue 2524863003: Move DisplayChangeObserver + tests from ash to ui. (Closed)
Patch Set: Rebase (again.. again.) Created 4 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 | « ash/display/display_change_observer_chromeos_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 0234a6cfa660328bdd5494defb31578867d90e30..bb1427219a7d9c3d2e453eb36030398b1fa85eaf 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -39,6 +39,7 @@ class AudioA11yController;
}
namespace display {
+class DisplayChangeObserver;
class DisplayManager;
}
@@ -73,7 +74,6 @@ class AcceleratorControllerDelegateAura;
class AshNativeCursorManager;
class AutoclickController;
class BluetoothNotificationController;
-class DisplayChangeObserver;
class DisplayColorManager;
class DisplayConfigurationController;
class DisplayErrorObserver;
@@ -509,7 +509,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<ProjectingObserver> projecting_observer_;
// Listens for output changes and updates the display manager.
- std::unique_ptr<DisplayChangeObserver> display_change_observer_;
+ std::unique_ptr<display::DisplayChangeObserver> display_change_observer_;
// Listens for shutdown and updates DisplayConfigurator.
std::unique_ptr<ShutdownObserver> shutdown_observer_;
« no previous file with comments | « ash/display/display_change_observer_chromeos_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698