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

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

Issue 1550483002: Switch to standard integer types in ui/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@int-ui-events
Patch Set: Created 4 years, 12 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
OLDNEW
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 <stddef.h>
8
7 #include <utility> 9 #include <utility>
8 #include <vector> 10 #include <vector>
9 11
10 #include "base/android/jni_array.h" 12 #include "base/android/jni_array.h"
11 #include "base/android/jni_string.h" 13 #include "base/android/jni_string.h"
12 #include "base/trace_event/trace_event.h" 14 #include "base/trace_event/trace_event.h"
13 #include "cc/resources/scoped_ui_resource.h" 15 #include "cc/resources/scoped_ui_resource.h"
14 #include "jni/ResourceManager_jni.h" 16 #include "jni/ResourceManager_jni.h"
15 #include "ui/android/resources/ui_resource_provider.h" 17 #include "ui/android/resources/ui_resource_provider.h"
16 #include "ui/android/window_android.h" 18 #include "ui/android/window_android.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 TRACE_EVENT2("ui", 247 TRACE_EVENT2("ui",
246 "ResourceManagerImpl::RequestCrushedSpriteResourceFromJava", 248 "ResourceManagerImpl::RequestCrushedSpriteResourceFromJava",
247 "bitmap_res_id", bitmap_res_id, 249 "bitmap_res_id", bitmap_res_id,
248 "metadata_res_id", metadata_res_id); 250 "metadata_res_id", metadata_res_id);
249 Java_ResourceManager_crushedSpriteResourceRequested( 251 Java_ResourceManager_crushedSpriteResourceRequested(
250 base::android::AttachCurrentThread(), java_obj_.obj(), 252 base::android::AttachCurrentThread(), java_obj_.obj(),
251 bitmap_res_id, metadata_res_id, reloading); 253 bitmap_res_id, metadata_res_id, reloading);
252 } 254 }
253 255
254 } // namespace ui 256 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/resources/resource_manager_impl.h ('k') | ui/android/resources/resource_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698