Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / display / mirror_window_controller.cc

diff --git a/src/ash/display/mirror_window_controller.cc b/src/ash/display/mirror_window_controller.cc
index f21c844..c760537 100644 (file)
--- a/src/ash/display/mirror_window_controller.cc
+++ b/src/ash/display/mirror_window_controller.cc
@@ -58,22 +58,18 @@ void DisableInput(XID window) {
 class NoneCaptureClient : public aura::client::CaptureClient {
  public:
   NoneCaptureClient() {}
-  virtual ~NoneCaptureClient() {}
+  ~NoneCaptureClient() override {}
 
  private:
   // Does a capture on the |window|.
-  virtual void SetCapture(aura::Window* window) OVERRIDE {}
+  void SetCapture(aura::Window* window) override {}
 
   // Releases a capture from the |window|.
-  virtual void ReleaseCapture(aura::Window* window) OVERRIDE {}
+  void ReleaseCapture(aura::Window* window) override {}
 
   // Returns the current capture window.
-  virtual aura::Window* GetCaptureWindow() OVERRIDE {
-    return NULL;
-  }
-  virtual aura::Window* GetGlobalCaptureWindow() OVERRIDE {
-    return NULL;
-  }
+  aura::Window* GetCaptureWindow() override { return NULL; }
+  aura::Window* GetGlobalCaptureWindow() override { return NULL; }
 
   DISALLOW_COPY_AND_ASSIGN(NoneCaptureClient);
 };
@@ -113,7 +109,7 @@ void MirrorWindowController::UpdateWindow(const DisplayInfo& display_info) {
 
     // TODO(oshima): Start mirroring.
     aura::Window* mirror_window = new aura::Window(NULL);
-    mirror_window->Init(aura::WINDOW_LAYER_TEXTURED);
+    mirror_window->Init(aura::WINDOW_LAYER_SOLID_COLOR);
     host->window()->AddChild(mirror_window);
     mirror_window->SetBounds(host->window()->bounds());
     mirror_window->Show();