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

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

Issue 1419123002: android: move overscroll effects to ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix exports for component build Created 5 years, 1 month 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 | « content/browser/android/animation_utils.h ('k') | content/browser/android/edge_effect.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/android/jni_weak_ref.h" 11 #include "base/android/jni_weak_ref.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/i18n/rtl.h" 13 #include "base/i18n/rtl.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/process/process.h" 15 #include "base/process/process.h"
16 #include "content/browser/android/overscroll_refresh.h"
17 #include "content/browser/renderer_host/render_widget_host_view_android.h" 16 #include "content/browser/renderer_host/render_widget_host_view_android.h"
18 #include "content/browser/web_contents/web_contents_impl.h" 17 #include "content/browser/web_contents/web_contents_impl.h"
19 #include "content/public/browser/android/content_view_core.h" 18 #include "content/public/browser/android/content_view_core.h"
20 #include "content/public/browser/web_contents_observer.h" 19 #include "content/public/browser/web_contents_observer.h"
21 #include "third_party/WebKit/public/web/WebInputEvent.h" 20 #include "third_party/WebKit/public/web/WebInputEvent.h"
21 #include "ui/android/overscroll_refresh.h"
22 #include "ui/gfx/geometry/rect.h" 22 #include "ui/gfx/geometry/rect.h"
23 #include "ui/gfx/geometry/rect_f.h" 23 #include "ui/gfx/geometry/rect_f.h"
24 #include "url/gurl.h" 24 #include "url/gurl.h"
25 25
26 namespace ui { 26 namespace ui {
27 class ViewAndroid; 27 class ViewAndroid;
28 class WindowAndroid; 28 class WindowAndroid;
29 } 29 }
30 30
31 namespace content { 31 namespace content {
32 32
33 class GinJavaBridgeDispatcherHost; 33 class GinJavaBridgeDispatcherHost;
34 class RenderFrameHost; 34 class RenderFrameHost;
35 class RenderWidgetHostViewAndroid; 35 class RenderWidgetHostViewAndroid;
36 struct MenuItem; 36 struct MenuItem;
37 37
38 class ContentViewCoreImpl : public ContentViewCore, 38 class ContentViewCoreImpl : public ContentViewCore,
39 public OverscrollRefreshHandler, 39 public ui::OverscrollRefreshHandler,
40 public WebContentsObserver { 40 public WebContentsObserver {
41 public: 41 public:
42 static ContentViewCoreImpl* FromWebContents(WebContents* web_contents); 42 static ContentViewCoreImpl* FromWebContents(WebContents* web_contents);
43 ContentViewCoreImpl(JNIEnv* env, 43 ContentViewCoreImpl(JNIEnv* env,
44 jobject obj, 44 jobject obj,
45 WebContents* web_contents, 45 WebContents* web_contents,
46 jobject view_android, 46 jobject view_android,
47 ui::WindowAndroid* window_android, 47 ui::WindowAndroid* window_android,
48 jobject java_bridge_retained_object_set); 48 jobject java_bridge_retained_object_set);
49 49
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_; 389 scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_;
390 390
391 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 391 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
392 }; 392 };
393 393
394 bool RegisterContentViewCore(JNIEnv* env); 394 bool RegisterContentViewCore(JNIEnv* env);
395 395
396 } // namespace content 396 } // namespace content
397 397
398 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 398 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/android/animation_utils.h ('k') | content/browser/android/edge_effect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698