chrome/browser/android/thumbnail/thumbnail_store.cc - Issue 755643004: Replace SystemUIResourceManager with ResourceManager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/thumbnail/thumbnail_store.cc

Issue 755643004: Replace SystemUIResourceManager with ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix clang build failure Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/android/thumbnail/thumbnail_store.cc

diff --git a/chrome/browser/android/thumbnail/thumbnail_store.cc b/chrome/browser/android/thumbnail/thumbnail_store.cc

index b8f0b729b259c81b7c56a227f29491082d509dc3..a904303afce0b6fd0070d2cf5bf184fa8b926416 100644

--- a/chrome/browser/android/thumbnail/thumbnail_store.cc

+++ b/chrome/browser/android/thumbnail/thumbnail_store.cc

@@ -15,7 +15,6 @@

#include "base/strings/string_number_conversions.h"

#include "base/threading/worker_pool.h"

#include "base/time/time.h"

-#include "content/public/browser/android/ui_resource_provider.h"

#include "content/public/browser/browser_thread.h"

#include "third_party/android_opengl/etc1/etc1.h"

#include "third_party/skia/include/core/SkBitmap.h"

@@ -23,6 +22,7 @@

#include "third_party/skia/include/core/SkData.h"

#include "third_party/skia/include/core/SkMallocPixelRef.h"

#include "third_party/skia/include/core/SkPixelRef.h"

+#include "ui/android/resources/ui_resource_provider.h"

#include "ui/gfx/android/device_display_info.h"

#include "ui/gfx/geometry/size_conversions.h"

@@ -136,7 +136,7 @@ ThumbnailStore::~ThumbnailStore() {

}

void ThumbnailStore::SetUIResourceProvider(

- content::UIResourceProvider* ui_resource_provider) {

+ ui::UIResourceProvider* ui_resource_provider) {

if (ui_resource_provider_ == ui_resource_provider)

return;

« no previous file with comments | « chrome/browser/android/thumbnail/thumbnail_store.h ('k') | content/browser/android/browser_jni_registrar.cc » ('j') | no next file with comments »