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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 30 matching lines...) Expand all
41 #include "content/public/browser/browser_context.h" 41 #include "content/public/browser/browser_context.h"
42 #include "content/public/browser/browser_thread.h" 42 #include "content/public/browser/browser_thread.h"
43 #include "content/public/browser/favicon_status.h" 43 #include "content/public/browser/favicon_status.h"
44 #include "content/public/browser/render_frame_host.h" 44 #include "content/public/browser/render_frame_host.h"
45 #include "content/public/browser/screen_orientation_dispatcher_host.h" 45 #include "content/public/browser/screen_orientation_dispatcher_host.h"
46 #include "content/public/browser/ssl_host_state_delegate.h" 46 #include "content/public/browser/ssl_host_state_delegate.h"
47 #include "content/public/browser/web_contents.h" 47 #include "content/public/browser/web_contents.h"
48 #include "content/public/common/content_client.h" 48 #include "content/public/common/content_client.h"
49 #include "content/public/common/content_switches.h" 49 #include "content/public/common/content_switches.h"
50 #include "content/public/common/menu_item.h" 50 #include "content/public/common/menu_item.h"
51 #include "content/public/common/page_transition_types.h"
52 #include "content/public/common/user_agent.h" 51 #include "content/public/common/user_agent.h"
53 #include "jni/ContentViewCore_jni.h" 52 #include "jni/ContentViewCore_jni.h"
54 #include "third_party/WebKit/public/web/WebInputEvent.h" 53 #include "third_party/WebKit/public/web/WebInputEvent.h"
55 #include "ui/base/android/view_android.h" 54 #include "ui/base/android/view_android.h"
56 #include "ui/base/android/window_android.h" 55 #include "ui/base/android/window_android.h"
57 #include "ui/gfx/android/java_bitmap.h" 56 #include "ui/gfx/android/java_bitmap.h"
58 #include "ui/gfx/screen.h" 57 #include "ui/gfx/screen.h"
59 #include "ui/gfx/size_conversions.h" 58 #include "ui/gfx/size_conversions.h"
60 #include "ui/gfx/size_f.h" 59 #include "ui/gfx/size_f.h"
61 60
(...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1339 reinterpret_cast<ui::WindowAndroid*>(window_android), 1338 reinterpret_cast<ui::WindowAndroid*>(window_android),
1340 retained_objects_set); 1339 retained_objects_set);
1341 return reinterpret_cast<intptr_t>(view); 1340 return reinterpret_cast<intptr_t>(view);
1342 } 1341 }
1343 1342
1344 bool RegisterContentViewCore(JNIEnv* env) { 1343 bool RegisterContentViewCore(JNIEnv* env) {
1345 return RegisterNativesImpl(env); 1344 return RegisterNativesImpl(env);
1346 } 1345 }
1347 1346
1348 } // namespace content 1347 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698