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

Unified Diff: ash/display/display_configuration_controller.h

Issue 2445583002: Relocate display_manager from ash to ui (Closed)
Patch Set: fix windows build Created 4 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
« no previous file with comments | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/display_configuration_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_configuration_controller.h
diff --git a/ash/display/display_configuration_controller.h b/ash/display/display_configuration_controller.h
index 64358da09ac446d3e9cf348a3b6a80194b9f5397..e8d8ce16d1cbcdb88cad2b1b46ab384dfba212c9 100644
--- a/ash/display/display_configuration_controller.h
+++ b/ash/display/display_configuration_controller.h
@@ -15,6 +15,7 @@
namespace display {
class DisplayLayout;
+class DisplayManager;
}
namespace ash {
@@ -24,7 +25,6 @@ class ShellTestApi;
} // namespace test
class DisplayAnimator;
-class DisplayManager;
// This class controls Display related configuration. Specifically it:
// * Handles animated transitions where appropriate.
@@ -35,7 +35,7 @@ class ASH_EXPORT DisplayConfigurationController
: public WindowTreeHostManager::Observer {
public:
DisplayConfigurationController(
- DisplayManager* display_manager,
+ display::DisplayManager* display_manager,
WindowTreeHostManager* window_tree_host_manager);
~DisplayConfigurationController() override;
@@ -78,7 +78,7 @@ class ASH_EXPORT DisplayConfigurationController
void SetMirrorModeImpl(bool mirror);
void SetPrimaryDisplayIdImpl(int64_t display_id);
- DisplayManager* display_manager_; // weak ptr
+ display::DisplayManager* display_manager_; // weak ptr
WindowTreeHostManager* window_tree_host_manager_; // weak ptr
std::unique_ptr<DisplayAnimator> display_animator_;
std::unique_ptr<DisplayChangeLimiter> limiter_;
« no previous file with comments | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/display_configuration_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698