Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / system_display / display_info_provider_chromeos.cc

diff --git a/src/chrome/browser/extensions/api/system_display/display_info_provider_chromeos.cc b/src/chrome/browser/extensions/api/system_display/display_info_provider_chromeos.cc
index cac0a6e..0aaf524 100644 (file)
--- a/src/chrome/browser/extensions/api/system_display/display_info_provider_chromeos.cc
+++ b/src/chrome/browser/extensions/api/system_display/display_info_provider_chromeos.cc
@@ -9,12 +9,11 @@
 #include "ash/shell.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
-#include "content/public/browser/browser_thread.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
-using ash::internal::DisplayManager;
+using ash::DisplayManager;
 
 namespace extensions {
 
@@ -364,8 +363,8 @@ void DisplayInfoProvider::UpdateDisplayUnitInfoForPlatform(
     const gfx::Display& display,
     extensions::api::system_display::DisplayUnitInfo* unit) {
 
-  ash::internal::DisplayManager* display_manager
-      = ash::Shell::GetInstance()->display_manager();
+  ash::DisplayManager* display_manager =
+      ash::Shell::GetInstance()->display_manager();
   unit->name = display_manager->GetDisplayNameForId(display.id());
   if (display_manager->IsMirrored()) {
     unit->mirroring_source_id =