ui/android: Fix Resource meta-data sharing with ResourceManager.

chrome/browser/android/compositor/decoration_title.cc

 // Copyright 2014 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 "chrome/browser/android/compositor/decoration_title.h"
 
 #include <android/bitmap.h>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 63 matching lines @@
   favicon_start_padding_ = favicon_start_padding;
   favicon_end_padding_ = favicon_end_padding;
   fade_width_ = fade_width;
 }
 
 void DecorationTitle::SetFaviconResourceId(int favicon_resource_id) {
   favicon_resource_id_ = favicon_resource_id;
 }
 
 void DecorationTitle::SetUIResourceIds() {
-  ui::ResourceManager::Resource* title_resource =
-      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC_BITMAP,
-                                     title_resource_id_);
+  ui::Resource* title_resource = resource_manager_->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_DYNAMIC_BITMAP, title_resource_id_);
   if (title_resource) {
-    layer_opaque_->SetUIResourceId(title_resource->ui_resource->id());
-    layer_fade_->SetUIResourceId(title_resource->ui_resource->id());
-    title_size_ = title_resource->size;
+    layer_opaque_->SetUIResourceId(title_resource->ui_resource()->id());
+    layer_fade_->SetUIResourceId(title_resource->ui_resource()->id());
+    title_size_ = title_resource->size();
   }
 
   if (!is_loading_) {
-    ui::ResourceManager::Resource* favicon_resource =
-        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC_BITMAP,
-                                       favicon_resource_id_);
+    ui::Resource* favicon_resource = resource_manager_->GetResource(
+        ui::ANDROID_RESOURCE_TYPE_DYNAMIC_BITMAP, favicon_resource_id_);
     if (favicon_resource) {
-      layer_favicon_->SetUIResourceId(favicon_resource->ui_resource->id());
-      favicon_size_ = favicon_resource->size;
+      layer_favicon_->SetUIResourceId(favicon_resource->ui_resource()->id());
+      favicon_size_ = favicon_resource->size();
     } else {
       layer_favicon_->SetUIResourceId(0);
     }
     layer_favicon_->SetTransform(gfx::Transform());
   } else {
     int resource_id =
         is_incognito_ ? spinner_incognito_resource_id_ : spinner_resource_id_;
 
-    ui::ResourceManager::Resource* spinner_resource =
-        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                       resource_id);
+    ui::Resource* spinner_resource = resource_manager_->GetResource(
+        ui::ANDROID_RESOURCE_TYPE_STATIC, resource_id);
 
     if (spinner_resource)
-      layer_favicon_->SetUIResourceId(spinner_resource->ui_resource->id());
+      layer_favicon_->SetUIResourceId(spinner_resource->ui_resource()->id());
 
     // Rotate about the center of the layer.
     layer_favicon_->SetTransformOrigin(
         gfx::Point3F(favicon_size_.width() / 2, favicon_size_.height() / 2, 0));
   }
 
   size_ = gfx::Size(title_size_.width() + favicon_size_.width(),
                     title_size_.height());
 }
 
@@ skipping 109 matching lines @@
     layer_fade_->SetIsDrawable(false);
   }
 }
 
 scoped_refptr<cc::Layer> DecorationTitle::layer() {
   DCHECK(layer_.get());
   return layer_;
 }
 
 }  // namespace android