Introduce RootWindowProperty for RootWindow's properties

ash/display/mirror_window_controller.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/mirror_window_controller.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 
 // Xlib.h defines RootWindow.
 #undef RootWindow
 #endif
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/root_window_transformers.h"
 #include "ash/host/root_window_host_factory.h"
+#include "ash/root_window_property.h"
 #include "ash/shell.h"
-#include "ash/wm/window_properties.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_transformer.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/cursor/cursors_aura.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 136 matching lines @@
     root_window_.reset(new aura::RootWindow(params));
     root_window_->SetName(
         base::StringPrintf("MirrorRootWindow-%d", mirror_root_window_count++));
     root_window_->compositor()->SetBackgroundColor(SK_ColorBLACK);
     // No need to remove RootWindowObserver because
     // the DisplayController object outlives RootWindow objects.
     root_window_->AddRootWindowObserver(
         Shell::GetInstance()->display_controller());
     root_window_->AddRootWindowObserver(this);
     // TODO(oshima): TouchHUD is using idkey.
-    root_window_->SetProperty(internal::kDisplayIdKey, display_info.id());
+    GetRootWindowProperty(root_window_.get())->display_id = display_info.id();
     root_window_->Init();
 #if defined(USE_X11)
     DisableInput(root_window_->GetAcceleratedWidget());
 #endif
 
     aura::client::SetCaptureClient(root_window_.get(), new NoneCaptureClient());
     root_window_->ShowRootWindow();
 
     // TODO(oshima): Start mirroring.
     aura::Window* mirror_window = new aura::Window(NULL);
     mirror_window->Init(ui::LAYER_TEXTURED);
     root_window_->AddChild(mirror_window);
     mirror_window->SetBounds(root_window_->bounds());
     mirror_window->Show();
     reflector_ = ui::ContextFactory::GetInstance()->
         CreateReflector(Shell::GetPrimaryRootWindow()->compositor(),
                         mirror_window->layer());
 
     cursor_window_ = new aura::Window(cursor_window_delegate_.get());
     cursor_window_->SetTransparent(true);
     cursor_window_->Init(ui::LAYER_TEXTURED);
     root_window_->AddChild(cursor_window_);
     cursor_window_->Show();
   } else {
-    root_window_->SetProperty(internal::kDisplayIdKey, display_info.id());
+    GetRootWindowProperty(root_window_.get())->display_id = display_info.id();
     root_window_->SetHostBounds(display_info.bounds_in_pixel());
   }
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   const DisplayInfo& source_display_info = display_manager->GetDisplayInfo(
       Shell::GetScreen()->GetPrimaryDisplay().id());
   DCHECK(display_manager->mirrored_display().is_valid());
   scoped_ptr<aura::RootWindowTransformer> transformer(
       internal::CreateRootWindowTransformerForMirroredDisplay(
           source_display_info,
@@ skipping 122 matching lines @@
       Shell::GetScreen()->GetPrimaryDisplay().id());
   DCHECK(display_manager->mirrored_display().is_valid());
   return scoped_ptr<aura::RootWindowTransformer>(
       internal::CreateRootWindowTransformerForMirroredDisplay(
           source_display_info,
           mirror_display_info));
 }
 
 }  // namespace internal
 }  // namespace ash