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/api/system_display/display_info_provider.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/display/types/display_constants.h" |
12 #include "ui/gfx/display.h" | 13 #include "ui/gfx/display.h" |
13 #include "ui/gfx/point.h" | 14 #include "ui/gfx/point.h" |
14 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" |
15 | 16 |
16 using ash::DisplayManager; | 17 using ash::DisplayManager; |
17 | 18 |
18 namespace extensions { | 19 namespace extensions { |
19 | 20 |
20 using api::system_display::Bounds; | 21 using api::system_display::Bounds; |
21 using api::system_display::DisplayUnitInfo; | 22 using api::system_display::DisplayUnitInfo; |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
323 if (info.overscan) { | 324 if (info.overscan) { |
324 display_manager->SetOverscanInsets( | 325 display_manager->SetOverscanInsets( |
325 display_id, | 326 display_id, |
326 gfx::Insets(info.overscan->top, info.overscan->left, | 327 gfx::Insets(info.overscan->top, info.overscan->left, |
327 info.overscan->bottom, info.overscan->right)); | 328 info.overscan->bottom, info.overscan->right)); |
328 } | 329 } |
329 | 330 |
330 // Process 'rotation' parameter. | 331 // Process 'rotation' parameter. |
331 if (info.rotation) { | 332 if (info.rotation) { |
332 display_manager->SetDisplayRotation(display_id, | 333 display_manager->SetDisplayRotation(display_id, |
333 DegreesToRotation(*info.rotation)); | 334 DegreesToRotation(*info.rotation), |
| 335 ui::USER); |
334 } | 336 } |
335 | 337 |
336 // Process new display origin parameters. | 338 // Process new display origin parameters. |
337 gfx::Point new_bounds_origin = target.bounds().origin(); | 339 gfx::Point new_bounds_origin = target.bounds().origin(); |
338 if (info.bounds_origin_x) | 340 if (info.bounds_origin_x) |
339 new_bounds_origin.set_x(*info.bounds_origin_x); | 341 new_bounds_origin.set_x(*info.bounds_origin_x); |
340 if (info.bounds_origin_y) | 342 if (info.bounds_origin_y) |
341 new_bounds_origin.set_y(*info.bounds_origin_y); | 343 new_bounds_origin.set_y(*info.bounds_origin_y); |
342 | 344 |
343 if (new_bounds_origin != target.bounds().origin()) { | 345 if (new_bounds_origin != target.bounds().origin()) { |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 | 379 |
378 const gfx::Insets overscan_insets = | 380 const gfx::Insets overscan_insets = |
379 display_manager->GetOverscanInsets(display.id()); | 381 display_manager->GetOverscanInsets(display.id()); |
380 unit->overscan.left = overscan_insets.left(); | 382 unit->overscan.left = overscan_insets.left(); |
381 unit->overscan.top = overscan_insets.top(); | 383 unit->overscan.top = overscan_insets.top(); |
382 unit->overscan.right = overscan_insets.right(); | 384 unit->overscan.right = overscan_insets.right(); |
383 unit->overscan.bottom = overscan_insets.bottom(); | 385 unit->overscan.bottom = overscan_insets.bottom(); |
384 } | 386 } |
385 | 387 |
386 } // namespace extensions | 388 } // namespace extensions |
OLD | NEW |