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

Side by Side Diff: chrome/browser/android/chrome_web_contents_delegate_android.h

Issue 11365199: Move WebContentsDelegateAndroid to content/components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/android/chrome_jni_registrar.cc ('k') | chrome/browser/component/components.gyp » ('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 (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 #ifndef CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ 5 #ifndef CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_
6 #define CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ 6 #define CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "chrome/browser/component/web_contents_delegate_android/web_contents_de legate_android.h" 10 #include "content/components/web_contents_delegate_android/web_contents_delegate _android.h"
11 #include "content/public/browser/notification_observer.h" 11 #include "content/public/browser/notification_observer.h"
12 #include "content/public/browser/notification_registrar.h" 12 #include "content/public/browser/notification_registrar.h"
13 13
14 class FindNotificationDetails; 14 class FindNotificationDetails;
15 15
16 namespace content { 16 namespace content {
17 struct FileChooserParams; 17 struct FileChooserParams;
18 class WebContents; 18 class WebContents;
19 } 19 }
20 20
21 namespace gfx { 21 namespace gfx {
22 class Rect; 22 class Rect;
23 class RectF; 23 class RectF;
24 } 24 }
25 25
26 namespace chrome { 26 namespace chrome {
27 namespace android { 27 namespace android {
28 28
29 // Chromium Android specific WebContentsDelegate. 29 // Chromium Android specific WebContentsDelegate.
30 // Should contain any WebContentsDelegate implementations required by 30 // Should contain any WebContentsDelegate implementations required by
31 // the Chromium Android port but not to be shared with WebView. 31 // the Chromium Android port but not to be shared with WebView.
32 class ChromeWebContentsDelegateAndroid 32 class ChromeWebContentsDelegateAndroid
33 : public web_contents_delegate_android::WebContentsDelegateAndroid, 33 : public content::WebContentsDelegateAndroid,
34 public content::NotificationObserver { 34 public content::NotificationObserver {
35 public: 35 public:
36 ChromeWebContentsDelegateAndroid(JNIEnv* env, jobject obj); 36 ChromeWebContentsDelegateAndroid(JNIEnv* env, jobject obj);
37 virtual ~ChromeWebContentsDelegateAndroid(); 37 virtual ~ChromeWebContentsDelegateAndroid();
38 38
39 virtual void RunFileChooser(content::WebContents* web_contents, 39 virtual void RunFileChooser(content::WebContents* web_contents,
40 const content::FileChooserParams& params) 40 const content::FileChooserParams& params)
41 OVERRIDE; 41 OVERRIDE;
42 virtual void CloseContents(content::WebContents* web_contents) OVERRIDE; 42 virtual void CloseContents(content::WebContents* web_contents) OVERRIDE;
43 virtual void FindReply(content::WebContents* web_contents, 43 virtual void FindReply(content::WebContents* web_contents,
(...skipping 26 matching lines...) Expand all
70 content::NotificationRegistrar notification_registrar_; 70 content::NotificationRegistrar notification_registrar_;
71 }; 71 };
72 72
73 // Register the native methods through JNI. 73 // Register the native methods through JNI.
74 bool RegisterChromeWebContentsDelegateAndroid(JNIEnv* env); 74 bool RegisterChromeWebContentsDelegateAndroid(JNIEnv* env);
75 75
76 } // namespace android 76 } // namespace android
77 } // namespace chrome 77 } // namespace chrome
78 78
79 #endif // CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ 79 #endif // CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_jni_registrar.cc ('k') | chrome/browser/component/components.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698