aura: Allow platform to choose how it retrieves ICCProfile.

In mus, the client should get the ICCProfile from the mus server,
instead of from the native platform. So get the ICCProfile from
a virtual function so that the platform can override it.

BUG=647510

Review-Url: https://codereview.chromium.org/2345283002
Cr-Commit-Position: refs/heads/master@{#419410}

ui/aura/window_tree_host.cc

@@ -69,11 +69,8 @@ void WindowTreeHost::InitCompositor() {
   compositor_->SetScaleAndSize(GetDeviceScaleFactorFromDisplay(window()),
                                GetBounds().size());
   compositor_->SetRootLayer(window()->layer());
-
-  // TODO(hubbe): Get the color space from the *current* monitor and
-  // update it when window is moved or color space configuration changes.
   compositor_->SetDisplayColorSpace(
-      gfx::ICCProfile::FromBestMonitor().GetColorSpace());
+      GetICCProfileForCurrentDisplay().GetColorSpace());
 }
 
 void WindowTreeHost::AddObserver(WindowTreeHostObserver* observer) {
@@ -313,6 +310,12 @@ void WindowTreeHost::OnHostLostWindowCapture() {
     capture_window->ReleaseCapture();
 }
 
+gfx::ICCProfile WindowTreeHost::GetICCProfileForCurrentDisplay() {
+  // TODO(hubbe): Get the color space from the *current* monitor and
+  // update it when window is moved or color space configuration changes.
+  return gfx::ICCProfile::FromBestMonitor();
+}
+
 ui::EventProcessor* WindowTreeHost::GetEventProcessor() {
   return event_processor();
 }

ui/aura/window_tree_host.h

@@ -18,6 +18,7 @@
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
+class ICCProfile;
 class Insets;
 class Point;
 class Rect;
@@ -214,6 +215,8 @@ class AURA_EXPORT WindowTreeHost : public ui::internal::InputMethodDelegate,
   // Hides the WindowTreeHost.
   virtual void HideImpl() = 0;
 
+  virtual gfx::ICCProfile GetICCProfileForCurrentDisplay();
+
   // Overridden from ui::EventSource:
   ui::EventProcessor* GetEventProcessor() override;
 

ui/views/mus/window_tree_host_mus.cc

@@ -94,4 +94,9 @@ void WindowTreeHostMus::OnCloseRequest() {
   OnHostCloseRequested();
 }
 
+gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() {
+  // TODO: This should read the profile from mus. crbug.com/647510
+  return gfx::ICCProfile();
+}
+
 }  // namespace views

ui/views/mus/window_tree_host_mus.h

@@ -40,6 +40,7 @@ class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform {
   void OnClosed() override;
   void OnActivationChanged(bool active) override;
   void OnCloseRequest() override;
+  gfx::ICCProfile GetICCProfileForCurrentDisplay() override;
 
   NativeWidgetMus* native_widget_;
   std::unique_ptr<InputMethodMus> input_method_;