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

Unified Diff: chrome/browser/chromeos/policy/display_rotation_default_handler.cc

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
Index: chrome/browser/chromeos/policy/display_rotation_default_handler.cc
diff --git a/chrome/browser/chromeos/policy/display_rotation_default_handler.cc b/chrome/browser/chromeos/policy/display_rotation_default_handler.cc
index df9351e77dea7ebec6e6d6cda24f89fe58a19b8c..0e083584c6f975a81955a8f1a0ac0a4da523317c 100644
--- a/chrome/browser/chromeos/policy/display_rotation_default_handler.cc
+++ b/chrome/browser/chromeos/policy/display_rotation_default_handler.cc
@@ -7,7 +7,6 @@
#include <stddef.h>
#include "ash/common/wm_shell.h"
-#include "ash/display/display_manager.h"
#include "ash/shell.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
@@ -17,6 +16,7 @@
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chromeos/settings/cros_settings_names.h"
+#include "ui/display/manager/display_manager.h"
namespace policy {
@@ -64,7 +64,7 @@ void DisplayRotationDefaultHandler::RotateDisplays() {
// being called by rotations here.
rotation_in_progress_ = true;
- ash::DisplayManager* const display_manager =
+ display::DisplayManager* const display_manager =
ash::Shell::GetInstance()->display_manager();
const size_t num_displays = display_manager->GetNumDisplays();
for (size_t i = 0; i < num_displays; ++i) {

Powered by Google App Engine
This is Rietveld 408576698