Replace SystemUIResourceManager with ResourceManager

content/browser/android/overscroll_controller_android.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 "content/browser/android/overscroll_controller_android.h"
 
 #include "base/android/build_info.h"
 #include "base/command_line.h"
 #include "cc/layers/layer.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "content/browser/android/edge_effect.h"
 #include "content/browser/android/edge_effect_l.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/input/did_overscroll_params.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/android/resources/resource_manager.h"
 #include "ui/base/android/window_android_compositor.h"
 
 namespace content {
 namespace {
 
 // Used for conditional creation of EdgeEffect types for the overscroll glow.
 const int kAndroidLSDKVersion = 21;
 
 // Default offset in dips from the top of the view beyond which the refresh
 // action will be activated.
 const int kDefaultRefreshDragTargetDips = 64;
 
 scoped_ptr<EdgeEffectBase> CreateGlowEdgeEffect(
-    ui::SystemUIResourceManager* resource_manager,
+    ui::ResourceManager* resource_manager,
     float dpi_scale) {
   DCHECK(resource_manager);
   static bool use_l_flavoured_effect =
       base::android::BuildInfo::GetInstance()->sdk_int() >= kAndroidLSDKVersion;
   if (use_l_flavoured_effect)
     return scoped_ptr<EdgeEffectBase>(new EdgeEffectL(resource_manager));
 
   return scoped_ptr<EdgeEffectBase>(
       new EdgeEffect(resource_manager, dpi_scale));
 }
@@ skipping 11 matching lines @@
 scoped_ptr<OverscrollRefresh> CreateRefreshEffect(
     ui::WindowAndroidCompositor* compositor,
     OverscrollRefreshClient* client,
     float dpi_scale) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisablePullToRefreshEffect)) {
     return nullptr;
   }
 
   return make_scoped_ptr(
-      new OverscrollRefresh(&compositor->GetSystemUIResourceManager(), client,
+      new OverscrollRefresh(&compositor->GetResourceManager(), client,
                             kDefaultRefreshDragTargetDips * dpi_scale));
 }
 
 }  // namespace
 
 OverscrollControllerAndroid::OverscrollControllerAndroid(
     WebContents* web_contents,
     ui::WindowAndroidCompositor* compositor,
     float dpi_scale)
     : compositor_(compositor),
@@ skipping 203 matching lines @@
 
   triggered_refresh_active_ = true;
   web_contents()->GetController().Reload(true);
 }
 
 bool OverscrollControllerAndroid::IsStillRefreshing() const {
   return triggered_refresh_active_;
 }
 
 scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() {
-  return CreateGlowEdgeEffect(&compositor_->GetSystemUIResourceManager(),
-                              dpi_scale_);
+  return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_);
 }
 
 void OverscrollControllerAndroid::SetNeedsAnimate() {
   compositor_->SetNeedsAnimate();
 }
 
 }  // namespace content