Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

chrome/browser/chromeos/display/display_preferences.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/display/display_preferences.h"
 
 #include "ash/display/display_controller.h"
-#include "ash/display/multi_display_manager.h"
+#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/pref_names.h"
 #include "googleurl/src/url_canon.h"
 #include "googleurl/src/url_util.h"
-#include "ui/aura/display_manager.h"
-#include "ui/aura/env.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/insets.h"
 
 namespace chromeos {
 namespace {
 
 // Replaces dot "." by "%2E" since it's the path separater of base::Value.  Also
 // replaces "%" by "%25" for unescaping.
 void EscapeDisplayName(const std::string& name, std::string* escaped) {
   DCHECK(escaped);
@@ skipping 30 matching lines @@
 }
 
 void InsetsToValue(const gfx::Insets& insets, base::DictionaryValue* value) {
   DCHECK(value);
   value->SetInteger("top", insets.top());
   value->SetInteger("left", insets.left());
   value->SetInteger("bottom", insets.bottom());
   value->SetInteger("right", insets.right());
 }
 
-ash::internal::MultiDisplayManager* GetDisplayManager() {
-  return static_cast<ash::internal::MultiDisplayManager*>(
-      aura::Env::GetInstance()->display_manager());
+ash::internal::DisplayManager* GetDisplayManager() {
+  return ash::Shell::GetInstance()->display_manager();
 }
 
 // Returns true id the current user can write display preferences to
 // Local State.
 bool IsValidUser() {
   UserManager* user_manager = UserManager::Get();
   return (user_manager->IsUserLoggedIn() &&
           !user_manager->IsLoggedInAsDemoUser() &&
           !user_manager->IsLoggedInAsGuest() &&
           !user_manager->IsLoggedInAsStub());
@@ skipping 25 matching lines @@
       continue;
     }
 
     display_controller->SetLayoutForDisplayName(
         UnescapeDisplayName(*it), layout);
   }
 }
 
 void NotifyDisplayOverscans() {
   PrefService* local_state = g_browser_process->local_state();
-  ash::internal::MultiDisplayManager* display_manager = GetDisplayManager();
+  ash::internal::DisplayManager* display_manager = GetDisplayManager();
 
   const base::DictionaryValue* overscans = local_state->GetDictionary(
       prefs::kDisplayOverscans);
   for (base::DictionaryValue::key_iterator it = overscans->begin_keys();
        it != overscans->end_keys(); ++it) {
     int64 display_id = gfx::Display::kInvalidDisplayID;
     if (!base::StringToInt64(*it, &display_id)) {
       LOG(WARNING) << "Invalid key, cannot convert to display ID: " << *it;
       continue;
     }
 
     const base::DictionaryValue* value = NULL;
     if (!overscans->GetDictionary(*it, &value) || value == NULL) {
       LOG(WARNING) << "Can't find dictionary value for " << *it;
       continue;
     }
 
     gfx::Insets insets;
     if (!ValueToInsets(*value, &insets)) {
       LOG(WARNING) << "Can't convert the data into insets for " << *it;
       continue;
     }
 
+    // TODO(oshima|mukai): DisplayManager is internal class.
+    // Move |SetOverscanInsets| to display controller.
     display_manager->SetOverscanInsets(display_id, insets);
   }
 }
 
 }  // namespace
 
 void RegisterDisplayPrefs(PrefService* pref_service) {
   // The default secondary display layout.
   pref_service->RegisterIntegerPref(prefs::kSecondaryDisplayLayout,
                                     static_cast<int>(ash::DisplayLayout::RIGHT),
@@ skipping 21 matching lines @@
 
 void SetDisplayLayoutPref(PrefService* pref_service,
                           const gfx::Display& display,
                           int layout,
                           int offset) {
   {
     DictionaryPrefUpdate update(pref_service, prefs::kSecondaryDisplays);
     ash::DisplayLayout display_layout(
         static_cast<ash::DisplayLayout::Position>(layout), offset);
 
-    aura::DisplayManager* display_manager =
-        aura::Env::GetInstance()->display_manager();
     std::string name;
-    EscapeDisplayName(display_manager->GetDisplayNameFor(display),
+    EscapeDisplayName(GetDisplayManager()->GetDisplayNameFor(display),
                       &name);
     DCHECK(!name.empty());
 
     base::DictionaryValue* pref_data = update.Get();
     scoped_ptr<base::Value>layout_value(new base::DictionaryValue());
     if (pref_data->HasKey(name)) {
       base::Value* value = NULL;
       if (pref_data->Get(name, &value) && value != NULL)
         layout_value.reset(value->DeepCopy());
     }
@@ skipping 48 matching lines @@
 }
 
 void NotifyDisplayLocalStatePrefChanged() {
   PrefService* local_state = g_browser_process->local_state();
   ash::Shell::GetInstance()->display_controller()->SetPrimaryDisplayId(
       local_state->GetInt64(prefs::kPrimaryDisplayID));
   NotifyDisplayOverscans();
 }
 
 }  // namespace chromeos