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

Side by Side Diff: chrome/android/testshell/testshell_tab.h

Issue 23264020: Move Android to use new Popup Blocker API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added NOTIMPLEMENTED Created 7 years, 4 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 #ifndef CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_ 5 #ifndef CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_
6 #define CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_ 6 #define CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "chrome/browser/android/tab_android.h" 12 #include "chrome/browser/android/tab_android.h"
13 13
14 namespace browser_sync { 14 namespace browser_sync {
15 class SyncedTabDelegate; 15 class SyncedTabDelegate;
16 } 16 }
17 17
18 namespace chrome { 18 namespace chrome {
19 struct NavigateParams;
20 }
21
22 namespace chrome {
19 namespace android { 23 namespace android {
20 class ChromeWebContentsDelegateAndroid; 24 class ChromeWebContentsDelegateAndroid;
21 } 25 }
22 } 26 }
23 27
24 namespace content { 28 namespace content {
25 class WebContents; 29 class WebContents;
26 } 30 }
27 31
28 namespace ui { 32 namespace ui {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 int g_value, 65 int g_value,
62 int b_value) OVERRIDE; 66 int b_value) OVERRIDE;
63 virtual void EditBookmark(int64 node_id, bool is_folder) OVERRIDE; 67 virtual void EditBookmark(int64 node_id, bool is_folder) OVERRIDE;
64 68
65 virtual void ShowSyncSettings() OVERRIDE; 69 virtual void ShowSyncSettings() OVERRIDE;
66 virtual void ShowTermsOfService() OVERRIDE; 70 virtual void ShowTermsOfService() OVERRIDE;
67 virtual bool ShouldWelcomePageLinkToTermsOfService() OVERRIDE; 71 virtual bool ShouldWelcomePageLinkToTermsOfService() OVERRIDE;
68 virtual void OnNewTabPageReady() OVERRIDE; 72 virtual void OnNewTabPageReady() OVERRIDE;
69 73
70 virtual void RunExternalProtocolDialog(const GURL& url) OVERRIDE; 74 virtual void RunExternalProtocolDialog(const GURL& url) OVERRIDE;
71 75 virtual void HandlePopupNavigation(chrome::NavigateParams* params) OVERRIDE;
72 virtual int GetSyncId() const OVERRIDE; 76 virtual int GetSyncId() const OVERRIDE;
73 virtual void SetSyncId(int sync_id) OVERRIDE; 77 virtual void SetSyncId(int sync_id) OVERRIDE;
74 78
75 // Register the Tab's native methods through JNI. 79 // Register the Tab's native methods through JNI.
76 static bool RegisterTestShellTab(JNIEnv* env); 80 static bool RegisterTestShellTab(JNIEnv* env);
77 81
78 // -------------------------------------------------------------------------- 82 // --------------------------------------------------------------------------
79 // Methods called from Java via JNI 83 // Methods called from Java via JNI
80 // -------------------------------------------------------------------------- 84 // --------------------------------------------------------------------------
81 void InitWebContentsDelegate(JNIEnv* env, 85 void InitWebContentsDelegate(JNIEnv* env,
82 jobject obj, 86 jobject obj,
83 jobject web_contents_delegate); 87 jobject web_contents_delegate);
84 88
85 base::android::ScopedJavaLocalRef<jstring> FixupUrl(JNIEnv* env, 89 base::android::ScopedJavaLocalRef<jstring> FixupUrl(JNIEnv* env,
86 jobject obj, 90 jobject obj,
87 jstring url); 91 jstring url);
88 92
89 protected: 93 protected:
90 virtual ~TestShellTab(); 94 virtual ~TestShellTab();
91 95
92 private: 96 private:
93 scoped_ptr<content::WebContents> web_contents_; 97 scoped_ptr<content::WebContents> web_contents_;
94 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 98 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
95 web_contents_delegate_; 99 web_contents_delegate_;
96 100
97 DISALLOW_COPY_AND_ASSIGN(TestShellTab); 101 DISALLOW_COPY_AND_ASSIGN(TestShellTab);
98 }; 102 };
99 103
100 #endif // CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_ 104 #endif // CHROME_ANDROID_TESTSHELL_TESTSHELL_TAB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698