Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/api/system_display/display_info_provider.h" | 5 #include "chrome/browser/extensions/display_info_provider_impl.h" |
| 6 | 6 |
| 7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
| 8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
| 11 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
| 12 #include "ui/gfx/display.h" | 12 #include "ui/gfx/display.h" |
| 13 #include "ui/gfx/point.h" | 13 #include "ui/gfx/point.h" |
| 14 #include "ui/gfx/rect.h" | 14 #include "ui/gfx/rect.h" |
| 15 | 15 |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 346 new_bounds_origin.y() - target.bounds().y()); | 346 new_bounds_origin.y() - target.bounds().y()); |
| 347 UpdateDisplayLayout(primary.bounds(), primary.id(), | 347 UpdateDisplayLayout(primary.bounds(), primary.id(), |
| 348 target_bounds, target.id()); | 348 target_bounds, target.id()); |
| 349 } | 349 } |
| 350 | 350 |
| 351 return true; | 351 return true; |
| 352 } | 352 } |
| 353 | 353 |
| 354 } // namespace | 354 } // namespace |
| 355 | 355 |
| 356 bool DisplayInfoProvider::SetInfo(const std::string& display_id, | 356 bool DisplayInfoProviderImpl::SetInfo(const std::string& display_id, |
| 357 const DisplayProperties& info, | 357 const DisplayProperties& info, |
|
James Cook
2014/08/15 19:58:42
please run "git cl format" on patches -- it'll fix
| |
| 358 std::string* error) { | 358 std::string* error) { |
| 359 return SetInfoImpl(display_id, info, error); | 359 return SetInfoImpl(display_id, info, error); |
| 360 } | 360 } |
| 361 | 361 |
| 362 void DisplayInfoProvider::UpdateDisplayUnitInfoForPlatform( | 362 void DisplayInfoProviderImpl::UpdateDisplayUnitInfoForPlatform( |
| 363 const gfx::Display& display, | 363 const gfx::Display& display, |
| 364 extensions::api::system_display::DisplayUnitInfo* unit) { | 364 extensions::api::system_display::DisplayUnitInfo* unit) { |
| 365 | 365 |
| 366 ash::DisplayManager* display_manager = | 366 ash::DisplayManager* display_manager = |
| 367 ash::Shell::GetInstance()->display_manager(); | 367 ash::Shell::GetInstance()->display_manager(); |
| 368 unit->name = display_manager->GetDisplayNameForId(display.id()); | 368 unit->name = display_manager->GetDisplayNameForId(display.id()); |
| 369 if (display_manager->IsMirrored()) { | 369 if (display_manager->IsMirrored()) { |
| 370 unit->mirroring_source_id = | 370 unit->mirroring_source_id = |
| 371 base::Int64ToString(display_manager->mirrored_display_id()); | 371 base::Int64ToString(display_manager->mirrored_display_id()); |
| 372 } | 372 } |
| 373 | 373 |
| 374 const float dpi = display.device_scale_factor() * kDpi96; | 374 const float dpi = display.device_scale_factor() * kDpi96; |
| 375 unit->dpi_x = dpi; | 375 unit->dpi_x = dpi; |
| 376 unit->dpi_y = dpi; | 376 unit->dpi_y = dpi; |
| 377 | 377 |
| 378 const gfx::Insets overscan_insets = | 378 const gfx::Insets overscan_insets = |
| 379 display_manager->GetOverscanInsets(display.id()); | 379 display_manager->GetOverscanInsets(display.id()); |
| 380 unit->overscan.left = overscan_insets.left(); | 380 unit->overscan.left = overscan_insets.left(); |
| 381 unit->overscan.top = overscan_insets.top(); | 381 unit->overscan.top = overscan_insets.top(); |
| 382 unit->overscan.right = overscan_insets.right(); | 382 unit->overscan.right = overscan_insets.right(); |
| 383 unit->overscan.bottom = overscan_insets.bottom(); | 383 unit->overscan.bottom = overscan_insets.bottom(); |
| 384 } | 384 } |
| 385 | 385 |
| 386 } // namespace extensions | 386 } // namespace extensions |
| OLD | NEW |