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

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

Issue 15702003: Move webkit/user_agent/ into webkit/common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "jni/ContentViewCore_jni.h" 45 #include "jni/ContentViewCore_jni.h"
46 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" 46 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
47 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 47 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
48 #include "third_party/WebKit/Source/WebKit/chromium/public/android/WebInputEvent Factory.h" 48 #include "third_party/WebKit/Source/WebKit/chromium/public/android/WebInputEvent Factory.h"
49 #include "ui/android/view_android.h" 49 #include "ui/android/view_android.h"
50 #include "ui/android/window_android.h" 50 #include "ui/android/window_android.h"
51 #include "ui/gfx/android/java_bitmap.h" 51 #include "ui/gfx/android/java_bitmap.h"
52 #include "ui/gfx/screen.h" 52 #include "ui/gfx/screen.h"
53 #include "ui/gfx/size_conversions.h" 53 #include "ui/gfx/size_conversions.h"
54 #include "ui/gfx/size_f.h" 54 #include "ui/gfx/size_f.h"
55 #include "webkit/common/user_agent/user_agent_util.h"
55 #include "webkit/glue/webmenuitem.h" 56 #include "webkit/glue/webmenuitem.h"
56 #include "webkit/user_agent/user_agent_util.h"
57 57
58 using base::android::AttachCurrentThread; 58 using base::android::AttachCurrentThread;
59 using base::android::ConvertJavaStringToUTF16; 59 using base::android::ConvertJavaStringToUTF16;
60 using base::android::ConvertJavaStringToUTF8; 60 using base::android::ConvertJavaStringToUTF8;
61 using base::android::ConvertUTF16ToJavaString; 61 using base::android::ConvertUTF16ToJavaString;
62 using base::android::ConvertUTF8ToJavaString; 62 using base::android::ConvertUTF8ToJavaString;
63 using base::android::ScopedJavaGlobalRef; 63 using base::android::ScopedJavaGlobalRef;
64 using base::android::ScopedJavaLocalRef; 64 using base::android::ScopedJavaLocalRef;
65 using WebKit::WebGestureEvent; 65 using WebKit::WebGestureEvent;
66 using WebKit::WebInputEvent; 66 using WebKit::WebInputEvent;
(...skipping 1495 matching lines...) Expand 10 before | Expand all | Expand 10 after
1562 reinterpret_cast<ui::ViewAndroid*>(view_android), 1562 reinterpret_cast<ui::ViewAndroid*>(view_android),
1563 reinterpret_cast<ui::WindowAndroid*>(window_android)); 1563 reinterpret_cast<ui::WindowAndroid*>(window_android));
1564 return reinterpret_cast<jint>(view); 1564 return reinterpret_cast<jint>(view);
1565 } 1565 }
1566 1566
1567 bool RegisterContentViewCore(JNIEnv* env) { 1567 bool RegisterContentViewCore(JNIEnv* env) {
1568 return RegisterNativesImpl(env); 1568 return RegisterNativesImpl(env);
1569 } 1569 }
1570 1570
1571 } // namespace content 1571 } // namespace content
OLDNEW
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/browser/devtools/devtools_http_handler_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698