| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/extensions/display_info_provider_chromeos.h" | 5 #include "chrome/browser/extensions/display_info_provider_chromeos.h" |
| 6 | 6 |
| 7 #include "ash/display/display_manager.h" | 7 #include "ash/display/display_manager.h" |
| 8 #include "ash/display/window_tree_host_manager.h" | 8 #include "ash/display/window_tree_host_manager.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 const gfx::Display& display, | 359 const gfx::Display& display, |
| 360 extensions::api::system_display::DisplayUnitInfo* unit) { | 360 extensions::api::system_display::DisplayUnitInfo* unit) { |
| 361 ash::DisplayManager* display_manager = | 361 ash::DisplayManager* display_manager = |
| 362 ash::Shell::GetInstance()->display_manager(); | 362 ash::Shell::GetInstance()->display_manager(); |
| 363 unit->name = display_manager->GetDisplayNameForId(display.id()); | 363 unit->name = display_manager->GetDisplayNameForId(display.id()); |
| 364 if (display_manager->IsInMirrorMode()) { | 364 if (display_manager->IsInMirrorMode()) { |
| 365 unit->mirroring_source_id = | 365 unit->mirroring_source_id = |
| 366 base::Int64ToString(display_manager->mirroring_display_id()); | 366 base::Int64ToString(display_manager->mirroring_display_id()); |
| 367 } | 367 } |
| 368 | 368 |
| 369 // TODO(hshi): determine the DPI of the screen. | 369 const ash::DisplayInfo& display_info = display_manager->GetDisplayInfo( |
| 370 const float kDpi96 = 96.0; | 370 display.id()); |
| 371 | 371 const float dpi = display_info.device_dpi() / display.device_scale_factor(); |
| 372 const float dpi = display.device_scale_factor() * kDpi96; | |
| 373 unit->dpi_x = dpi; | 372 unit->dpi_x = dpi; |
| 374 unit->dpi_y = dpi; | 373 unit->dpi_y = dpi; |
| 375 | 374 |
| 376 const gfx::Insets overscan_insets = | 375 const gfx::Insets overscan_insets = |
| 377 display_manager->GetOverscanInsets(display.id()); | 376 display_manager->GetOverscanInsets(display.id()); |
| 378 unit->overscan.left = overscan_insets.left(); | 377 unit->overscan.left = overscan_insets.left(); |
| 379 unit->overscan.top = overscan_insets.top(); | 378 unit->overscan.top = overscan_insets.top(); |
| 380 unit->overscan.right = overscan_insets.right(); | 379 unit->overscan.right = overscan_insets.right(); |
| 381 unit->overscan.bottom = overscan_insets.bottom(); | 380 unit->overscan.bottom = overscan_insets.bottom(); |
| 382 } | 381 } |
| 383 | 382 |
| 384 gfx::Screen* DisplayInfoProviderChromeOS::GetActiveScreen() { | 383 gfx::Screen* DisplayInfoProviderChromeOS::GetActiveScreen() { |
| 385 return ash::Shell::GetScreen(); | 384 return ash::Shell::GetScreen(); |
| 386 } | 385 } |
| 387 | 386 |
| 388 // static | 387 // static |
| 389 DisplayInfoProvider* DisplayInfoProvider::Create() { | 388 DisplayInfoProvider* DisplayInfoProvider::Create() { |
| 390 return new DisplayInfoProviderChromeOS(); | 389 return new DisplayInfoProviderChromeOS(); |
| 391 } | 390 } |
| 392 | 391 |
| 393 } // namespace extensions | 392 } // namespace extensions |
| OLD | NEW |