OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
645 aura::Window* window) { | 645 aura::Window* window) { |
646 display::Screen* screen = display::Screen::GetScreen(); | 646 display::Screen* screen = display::Screen::GetScreen(); |
647 const display::Display display = window | 647 const display::Display display = window |
648 ? screen->GetDisplayNearestWindow(window) | 648 ? screen->GetDisplayNearestWindow(window) |
649 : screen->GetPrimaryDisplay(); | 649 : screen->GetPrimaryDisplay(); |
650 results->rect = display.bounds(); | 650 results->rect = display.bounds(); |
651 results->available_rect = display.work_area(); | 651 results->available_rect = display.work_area(); |
652 // TODO(derat|oshima): Don't hardcode this. Get this from display object. | 652 // TODO(derat|oshima): Don't hardcode this. Get this from display object. |
653 results->depth = 24; | 653 results->depth = 24; |
654 results->depth_per_component = 8; | 654 results->depth_per_component = 8; |
| 655 results->is_monochrome = false; |
655 results->device_scale_factor = display.device_scale_factor(); | 656 results->device_scale_factor = display.device_scale_factor(); |
656 | 657 |
657 // The Display rotation and the ScreenInfo orientation are not the same | 658 // The Display rotation and the ScreenInfo orientation are not the same |
658 // angle. The former is the physical display rotation while the later is the | 659 // angle. The former is the physical display rotation while the later is the |
659 // rotation required by the content to be shown properly on the screen, in | 660 // rotation required by the content to be shown properly on the screen, in |
660 // other words, relative to the physical display. | 661 // other words, relative to the physical display. |
661 results->orientation_angle = display.RotationAsDegree(); | 662 results->orientation_angle = display.RotationAsDegree(); |
662 if (results->orientation_angle == 90) | 663 if (results->orientation_angle == 90) |
663 results->orientation_angle = 270; | 664 results->orientation_angle = 270; |
664 else if (results->orientation_angle == 270) | 665 else if (results->orientation_angle == 270) |
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1212 bool allow_multiple_selection) { | 1213 bool allow_multiple_selection) { |
1213 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; | 1214 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; |
1214 } | 1215 } |
1215 | 1216 |
1216 void WebContentsViewAura::HidePopupMenu() { | 1217 void WebContentsViewAura::HidePopupMenu() { |
1217 NOTIMPLEMENTED(); | 1218 NOTIMPLEMENTED(); |
1218 } | 1219 } |
1219 #endif | 1220 #endif |
1220 | 1221 |
1221 } // namespace content | 1222 } // namespace content |
OLD | NEW |