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

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

Issue 16408017: Use a direct include of utf_string_conversions.h in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log
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_core_impl.h" 5 #include "content/browser/android/content_view_core_impl.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/json/json_writer.h" 12 #include "base/json/json_writer.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "cc/layers/layer.h" 16 #include "cc/layers/layer.h"
17 #include "content/browser/android/interstitial_page_delegate_android.h" 17 #include "content/browser/android/interstitial_page_delegate_android.h"
18 #include "content/browser/android/load_url_params.h" 18 #include "content/browser/android/load_url_params.h"
19 #include "content/browser/android/media_player_manager_impl.h" 19 #include "content/browser/android/media_player_manager_impl.h"
20 #include "content/browser/android/sync_input_event_filter.h" 20 #include "content/browser/android/sync_input_event_filter.h"
21 #include "content/browser/android/touch_point.h" 21 #include "content/browser/android/touch_point.h"
22 #include "content/browser/renderer_host/compositor_impl_android.h" 22 #include "content/browser/renderer_host/compositor_impl_android.h"
23 #include "content/browser/renderer_host/java/java_bound_object.h" 23 #include "content/browser/renderer_host/java/java_bound_object.h"
24 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h" 24 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h"
(...skipping 1540 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 reinterpret_cast<ui::ViewAndroid*>(view_android), 1565 reinterpret_cast<ui::ViewAndroid*>(view_android),
1566 reinterpret_cast<ui::WindowAndroid*>(window_android)); 1566 reinterpret_cast<ui::WindowAndroid*>(window_android));
1567 return reinterpret_cast<jint>(view); 1567 return reinterpret_cast<jint>(view);
1568 } 1568 }
1569 1569
1570 bool RegisterContentViewCore(JNIEnv* env) { 1570 bool RegisterContentViewCore(JNIEnv* env) {
1571 return RegisterNativesImpl(env); 1571 return RegisterNativesImpl(env);
1572 } 1572 }
1573 1573
1574 } // namespace content 1574 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698