Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 2954793002: color: Replace more instances of ICCProfile with ColorSpace (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 display::Screen* screen = display::Screen::GetScreen(); 704 display::Screen* screen = display::Screen::GetScreen();
705 const display::Display display = window 705 const display::Display display = window
706 ? screen->GetDisplayNearestWindow(window) 706 ? screen->GetDisplayNearestWindow(window)
707 : screen->GetPrimaryDisplay(); 707 : screen->GetPrimaryDisplay();
708 results->rect = display.bounds(); 708 results->rect = display.bounds();
709 results->available_rect = display.work_area(); 709 results->available_rect = display.work_area();
710 results->depth = display.color_depth(); 710 results->depth = display.color_depth();
711 results->depth_per_component = display.depth_per_component(); 711 results->depth_per_component = display.depth_per_component();
712 results->is_monochrome = display.is_monochrome(); 712 results->is_monochrome = display.is_monochrome();
713 results->device_scale_factor = display.device_scale_factor(); 713 results->device_scale_factor = display.device_scale_factor();
714 display.color_space().GetICCProfile(&results->icc_profile); 714 results->color_space = display.color_space();
715 715
716 // The Display rotation and the ScreenInfo orientation are not the same 716 // The Display rotation and the ScreenInfo orientation are not the same
717 // angle. The former is the physical display rotation while the later is the 717 // angle. The former is the physical display rotation while the later is the
718 // rotation required by the content to be shown properly on the screen, in 718 // rotation required by the content to be shown properly on the screen, in
719 // other words, relative to the physical display. 719 // other words, relative to the physical display.
720 results->orientation_angle = display.RotationAsDegree(); 720 results->orientation_angle = display.RotationAsDegree();
721 if (results->orientation_angle == 90) 721 if (results->orientation_angle == 90)
722 results->orientation_angle = 270; 722 results->orientation_angle = 270;
723 else if (results->orientation_angle == 270) 723 else if (results->orientation_angle == 270)
724 results->orientation_angle = 90; 724 results->orientation_angle = 90;
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
1342 bool allow_multiple_selection) { 1342 bool allow_multiple_selection) {
1343 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; 1343 NOTIMPLEMENTED() << " show " << items.size() << " menu items";
1344 } 1344 }
1345 1345
1346 void WebContentsViewAura::HidePopupMenu() { 1346 void WebContentsViewAura::HidePopupMenu() {
1347 NOTIMPLEMENTED(); 1347 NOTIMPLEMENTED();
1348 } 1348 }
1349 #endif 1349 #endif
1350 1350
1351 } // namespace content 1351 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | content/browser/web_contents/web_contents_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698