Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(825)

Side by Side Diff: content/browser/android/content_view_render_view.cc

Issue 755643004: Replace SystemUIResourceManager with ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/android/content_view_render_view.h" 5 #include "content/browser/android/content_view_render_view.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "cc/layers/layer.h" 14 #include "cc/layers/layer.h"
15 #include "content/browser/android/content_view_core_impl.h" 15 #include "content/browser/android/content_view_core_impl.h"
16 #include "content/public/browser/android/compositor.h" 16 #include "content/public/browser/android/compositor.h"
17 #include "content/public/browser/android/content_view_layer_renderer.h" 17 #include "content/public/browser/android/content_view_layer_renderer.h"
18 #include "content/public/browser/android/layer_tree_build_helper.h" 18 #include "content/public/browser/android/layer_tree_build_helper.h"
19 #include "content/public/browser/android/ui_resource_provider.h"
20 #include "jni/ContentViewRenderView_jni.h" 19 #include "jni/ContentViewRenderView_jni.h"
20 #include "ui/android/resources/ui_resource_provider.h"
jdduke (slow) 2014/12/08 16:23:13 Do we even need this include?
Jaekyun Seok (inactive) 2014/12/09 11:42:35 Done.
21 #include "ui/gfx/android/java_bitmap.h" 21 #include "ui/gfx/android/java_bitmap.h"
22 #include "ui/gfx/size.h" 22 #include "ui/gfx/size.h"
23 23
24 #include <android/bitmap.h> 24 #include <android/bitmap.h>
25 #include <android/native_window_jni.h> 25 #include <android/native_window_jni.h>
26 26
27 using base::android::ScopedJavaLocalRef; 27 using base::android::ScopedJavaLocalRef;
28 28
29 namespace content { 29 namespace content {
30 30
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 compositor_.reset(Compositor::Create(this, root_window_)); 145 compositor_.reset(Compositor::Create(this, root_window_));
146 } 146 }
147 147
148 jlong ContentViewRenderView::GetUIResourceProvider(JNIEnv* env, 148 jlong ContentViewRenderView::GetUIResourceProvider(JNIEnv* env,
149 jobject obj) { 149 jobject obj) {
150 if (!compositor_) 150 if (!compositor_)
151 return 0; 151 return 0;
152 return reinterpret_cast<intptr_t>(&compositor_->GetUIResourceProvider()); 152 return reinterpret_cast<intptr_t>(&compositor_->GetUIResourceProvider());
153 } 153 }
154 } // namespace content 154 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698