Cleanup: Remove ViewProp from aura build

ui/aura/window.cc

 // Copyright (c) 2011 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 "ui/aura/window.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/desktop_delegate.h"
 #include "ui/aura/event.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_types.h"
 #include "ui/base/animation/multi_animation.h"
-#include "ui/base/view_prop.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/screen.h"
 
 namespace aura {
 
 Window::Window(WindowDelegate* delegate)
     : type_(WINDOW_TYPE_UNKNOWN),
       delegate_(delegate),
       show_state_(ui::SHOW_STATE_NORMAL),
@@ skipping 32 matching lines @@
   STLDeleteElements(&transient_children);
   DCHECK(transient_children_.empty());
 
   // And let the delegate do any post cleanup.
   if (delegate_)
     delegate_->OnWindowDestroyed();
   if (parent_)
     parent_->RemoveChild(this);
 
   FOR_EACH_OBSERVER(WindowObserver, observers_, OnWindowDestroyed(this));
-
-  STLDeleteValues(&prop_map_);
 }
 
 void Window::Init(ui::Layer::LayerType layer_type) {
   layer_.reset(new ui::Layer(Desktop::GetInstance()->compositor(), layer_type));
   layer_->SetVisible(false);
   layer_->set_delegate(this);
 }
 
 void Window::SetType(WindowType type) {
   // Cannot change type after the window is initialized.
@@ skipping 330 matching lines @@
 
   for (Windows::const_iterator it = children_.begin();
        it != children_.end(); ++it) {
     if ((*it)->IsOrContainsFullscreenWindow())
       return true;
   }
   return false;
 }
 
 void Window::SetProperty(const char* name, void* value) {
-  ui::ViewProp* prop = prop_map_[name];
-  delete prop;
   if (value)
-    prop_map_[name] = new ui::ViewProp(this, name, value);
+    prop_map_[name] = value;
   else
     prop_map_.erase(name);
 }
 
 void* Window::GetProperty(const char* name) const {
-  return ui::ViewProp::GetValue(const_cast<gfx::NativeView>(this), name);
+  std::map<const char*, void*>::const_iterator iter = prop_map_.find(name);
+  if (iter == prop_map_.end())
+    return NULL;
+  return iter->second;
 }
 
 Desktop* Window::GetDesktop() {
   return parent_ ? parent_->GetDesktop() : NULL;
 }
 
 void Window::SetBoundsInternal(const gfx::Rect& new_bounds) {
   const gfx::Rect old_bounds = bounds();
   if (old_bounds == new_bounds)
     return;
@@ skipping 85 matching lines @@
 
 void Window::OnPaintLayer(gfx::Canvas* canvas) {
   delegate_->OnPaint(canvas);
 }
 
 void Window::OnLayerAnimationEnded(
     const ui::LayerAnimationSequence* animation) {
 }
 
 }  // namespace aura