ui/android/resources/resource_manager_impl.cc - Issue 866893002: Mechanical rename of tracing includes for /ui

Side by Side Diff

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

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

Side by Side Diff: ui/android/resources/resource_manager_impl.cc

Issue 866893002: Mechanical rename of tracing includes for /ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part2

Patch Set: rebase. Created 5 years, 10 months 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

« no previous file with comments | « no previous file | ui/aura/window_event_dispatcher.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "ui/android/resources/resource_manager_impl.h"	5 #include "ui/android/resources/resource_manager_impl.h"

6	6

7 #include "base/android/jni_string.h"	7 #include "base/android/jni_string.h"

8 #include "base/debug/trace_event.h"	8 #include "base/trace_event/trace_event.h"

9 #include "jni/ResourceManager_jni.h"	9 #include "jni/ResourceManager_jni.h"

10 #include "ui/android/resources/ui_resource_android.h"	10 #include "ui/android/resources/ui_resource_android.h"

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

12 #include "ui/gfx/android/java_bitmap.h"	12 #include "ui/gfx/android/java_bitmap.h"

13	13

14 namespace ui {	14 namespace ui {

15	15

16 // static	16 // static

17 ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) {	17 ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) {

18 return reinterpret_cast<ResourceManagerImpl*>(	18 return reinterpret_cast<ResourceManagerImpl*>(

(...skipping 104 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
123 void ResourceManagerImpl::RequestResourceFromJava(AndroidResourceType res_type,	123 void ResourceManagerImpl::RequestResourceFromJava(AndroidResourceType res_type,

124 int res_id) {	124 int res_id) {

125 TRACE_EVENT2("ui", "ResourceManagerImpl::RequestResourceFromJava",	125 TRACE_EVENT2("ui", "ResourceManagerImpl::RequestResourceFromJava",

126 "resource_type", res_type,	126 "resource_type", res_type,

127 "resource_id", res_id);	127 "resource_id", res_id);

128 Java_ResourceManager_resourceRequested(base::android::AttachCurrentThread(),	128 Java_ResourceManager_resourceRequested(base::android::AttachCurrentThread(),

129 java_obj_.obj(), res_type, res_id);	129 java_obj_.obj(), res_type, res_id);

130 }	130 }

131	131

132 } // namespace ui	132 } // namespace ui

OLD	NEW