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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/icc_profile.cc

Issue 2950183002: color: Use ICCProfile from display::Display instead of FromBestMonitor (Closed)
Patch Set: Update expectations 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 side-by-side diff with in-line comments
Download patch
« content/browser/web_contents/web_contents_view_aura.cc ('K') | « ui/gfx/color_space.cc ('k') | ui/views/widget/desktop_aura/desktop_screen_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/icc_profile.cc
diff --git a/ui/gfx/icc_profile.cc b/ui/gfx/icc_profile.cc
index a8d643d3bf903863c0f076f3cfe4134f8ef393ee..c57eb526f5655e06643be70f398ed1d293ccea46 100644
--- a/ui/gfx/icc_profile.cc
+++ b/ui/gfx/icc_profile.cc
@@ -104,7 +104,8 @@ ICCProfile ICCProfile::FromDataWithId(const void* data,
return icc_profile;
}
-#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(USE_X11)
+#if (!defined(OS_WIN) && !defined(USE_X11) && !defined(OS_MACOSX)) || \
+ defined(OS_IOS)
// static
ICCProfile ICCProfile::FromBestMonitor() {
if (HasForcedProfile())
« content/browser/web_contents/web_contents_view_aura.cc ('K') | « ui/gfx/color_space.cc ('k') | ui/views/widget/desktop_aura/desktop_screen_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698