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

chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc

Index: chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc
diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc
index ef171f588f832de9911d0c8deef977502d7b2a3f..c0914fc495c2fcac981b2725a01e3d11467021ef 100644
--- a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc
+++ b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/android/compositor/layer_title_cache.h"
 #include "content/public/browser/android/compositor.h"
 #include "jni/TabStripSceneLayer_jni.h"
+#include "ui/android/resources/nine_patch_resource.h"
 #include "ui/android/resources/resource_manager_impl.h"
 #include "ui/gfx/transform.h"
 
@@ -147,15 +148,14 @@ void TabStripSceneLayer::UpdateNewTabButton(
     const JavaParamRef<jobject>& jresource_manager) {
   ui::ResourceManager* resource_manager =
       ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
-  ui::ResourceManager::Resource* button_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    resource_id);
+  ui::Resource* button_resource = resource_manager->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, resource_id);
 
-  new_tab_button_->SetUIResourceId(button_resource->ui_resource->id());
-  float left_offset = (width - button_resource->size.width()) / 2;
-  float top_offset = (height - button_resource->size.height()) / 2;
+  new_tab_button_->SetUIResourceId(button_resource->ui_resource()->id());
+  float left_offset = (width - button_resource->size().width()) / 2;
+  float top_offset = (height - button_resource->size().height()) / 2;
   new_tab_button_->SetPosition(gfx::PointF(x + left_offset, y + top_offset));
-  new_tab_button_->SetBounds(button_resource->size);
+  new_tab_button_->SetBounds(button_resource->size());
   new_tab_button_->SetHideLayerAndSubtree(!visible);
 }
 
@@ -172,16 +172,15 @@ void TabStripSceneLayer::UpdateModelSelectorButton(
     const JavaParamRef<jobject>& jresource_manager) {
   ui::ResourceManager* resource_manager =
       ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
-  ui::ResourceManager::Resource* button_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    resource_id);
+  ui::Resource* button_resource = resource_manager->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, resource_id);
 
-  model_selector_button_->SetUIResourceId(button_resource->ui_resource->id());
-  float left_offset = (width - button_resource->size.width()) / 2;
-  float top_offset = (height - button_resource->size.height()) / 2;
+  model_selector_button_->SetUIResourceId(button_resource->ui_resource()->id());
+  float left_offset = (width - button_resource->size().width()) / 2;
+  float top_offset = (height - button_resource->size().height()) / 2;
   model_selector_button_->SetPosition(
       gfx::PointF(x + left_offset, y + top_offset));
-  model_selector_button_->SetBounds(button_resource->size);
+  model_selector_button_->SetBounds(button_resource->size());
   model_selector_button_->SetHideLayerAndSubtree(!visible);
 }
 
@@ -201,10 +200,9 @@ void TabStripSceneLayer::UpdateTabStripLeftFade(
   // Set UI resource.
   ui::ResourceManager* resource_manager =
       ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
-  ui::ResourceManager::Resource* fade_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    resource_id);
-  left_fade_->SetUIResourceId(fade_resource->ui_resource->id());
+  ui::Resource* fade_resource = resource_manager->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, resource_id);
+  left_fade_->SetUIResourceId(fade_resource->ui_resource()->id());
 
   // The same resource is used for both left and right fade, so the
   // resource must be rotated for the left fade.
@@ -217,12 +215,12 @@ void TabStripSceneLayer::UpdateTabStripLeftFade(
 
   // Set bounds. Use the parent layer height so the 1px fade resource is
   // stretched vertically.
-  left_fade_->SetBounds(gfx::Size(fade_resource->size.width(),
+  left_fade_->SetBounds(gfx::Size(fade_resource->size().width(),
                                   scrollable_strip_layer_->bounds().height()));
 
   // Set position. The rotation set above requires the layer to be offset
   // by its width in order to display on the left edge.
-  left_fade_->SetPosition(gfx::PointF(fade_resource->size.width(), 0));
+  left_fade_->SetPosition(gfx::PointF(fade_resource->size().width(), 0));
 
   // Ensure layer is visible.
   left_fade_->SetHideLayerAndSubtree(false);
@@ -244,23 +242,21 @@ void TabStripSceneLayer::UpdateTabStripRightFade(
   // Set UI resource.
   ui::ResourceManager* resource_manager =
       ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
-  ui::ResourceManager::Resource* fade_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    resource_id);
-  right_fade_->SetUIResourceId(fade_resource->ui_resource->id());
+  ui::Resource* fade_resource = resource_manager->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, resource_id);
+  right_fade_->SetUIResourceId(fade_resource->ui_resource()->id());
 
   // Set opacity.
   right_fade_->SetOpacity(opacity);
 
   // Set bounds. Use the parent layer height so the 1px fade resource is
   // stretched vertically.
-  right_fade_->SetBounds(gfx::Size(
-      fade_resource->size.width(),
-      scrollable_strip_layer_->bounds().height()));
+  right_fade_->SetBounds(gfx::Size(fade_resource->size().width(),
+                                   scrollable_strip_layer_->bounds().height()));
 
   // Set position. The right fade is positioned at the end of the tab strip.
   float x =
-      scrollable_strip_layer_->bounds().width() - fade_resource->size.width();
+      scrollable_strip_layer_->bounds().width() - fade_resource->size().width();
   right_fade_->SetPosition(gfx::PointF(x, 0));
 
   // Ensure layer is visible.
@@ -292,12 +288,11 @@ void TabStripSceneLayer::PutStripTabLayer(
   ui::ResourceManager* resource_manager =
       ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
   scoped_refptr<TabHandleLayer> layer = GetNextLayer(layer_title_cache);
-  ui::ResourceManager::Resource* tab_handle_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    handle_resource_id);
-  ui::ResourceManager::Resource* close_button_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    close_resource_id);
+  ui::NinePatchResource* tab_handle_resource =
+      ui::NinePatchResource::From(resource_manager->GetResource(
+          ui::ANDROID_RESOURCE_TYPE_STATIC, handle_resource_id));
+  ui::Resource* close_button_resource = resource_manager->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, close_resource_id);
   layer->SetProperties(id, close_button_resource, tab_handle_resource,
                        foreground, close_pressed, toolbar_width, x, y, width,
                        height, content_offset_x, close_button_alpha, is_loading,