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

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

Issue 23264020: Move Android to use new Popup Blocker API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed testshell break 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 #include "chrome/android/testshell/testshell_tab.h" 5 #include "chrome/android/testshell/testshell_tab.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 9 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
10 #include "chrome/browser/ui/android/window_android_helper.h" 10 #include "chrome/browser/ui/android/window_android_helper.h"
11 #include "chrome/browser/ui/browser_navigator.h"
11 #include "chrome/common/net/url_fixer_upper.h" 12 #include "chrome/common/net/url_fixer_upper.h"
12 #include "content/public/browser/android/content_view_core.h" 13 #include "content/public/browser/android/content_view_core.h"
13 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
14 #include "jni/TestShellTab_jni.h" 15 #include "jni/TestShellTab_jni.h"
15 #include "ui/android/window_android.h" 16 #include "ui/android/window_android.h"
16 #include "url/gurl.h" 17 #include "url/gurl.h"
17 18
18 using base::android::ConvertJavaStringToUTF8; 19 using base::android::ConvertJavaStringToUTF8;
19 using base::android::ConvertUTF8ToJavaString; 20 using base::android::ConvertUTF8ToJavaString;
20 using base::android::ScopedJavaLocalRef; 21 using base::android::ScopedJavaLocalRef;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 } 91 }
91 92
92 void TestShellTab::OnNewTabPageReady() { 93 void TestShellTab::OnNewTabPageReady() {
93 NOTIMPLEMENTED(); 94 NOTIMPLEMENTED();
94 } 95 }
95 96
96 void TestShellTab::RunExternalProtocolDialog(const GURL& url) { 97 void TestShellTab::RunExternalProtocolDialog(const GURL& url) {
97 NOTIMPLEMENTED(); 98 NOTIMPLEMENTED();
98 } 99 }
99 100
101 void TestShellTab::HandlePopupNavigation(chrome::NavigateParams* params) { }
Yaron 2013/08/22 18:30:05 NOTIMPLEMENTED
102
100 bool TestShellTab::RegisterTestShellTab(JNIEnv* env) { 103 bool TestShellTab::RegisterTestShellTab(JNIEnv* env) {
101 return RegisterNativesImpl(env); 104 return RegisterNativesImpl(env);
102 } 105 }
103 106
104 void TestShellTab::InitWebContentsDelegate( 107 void TestShellTab::InitWebContentsDelegate(
105 JNIEnv* env, 108 JNIEnv* env,
106 jobject obj, 109 jobject obj,
107 jobject web_contents_delegate) { 110 jobject web_contents_delegate) {
108 web_contents_delegate_.reset( 111 web_contents_delegate_.reset(
109 new ChromeWebContentsDelegateAndroid(env, web_contents_delegate)); 112 new ChromeWebContentsDelegateAndroid(env, web_contents_delegate));
(...skipping 24 matching lines...) Expand all
134 reinterpret_cast<WindowAndroid*>(window_android_ptr)); 137 reinterpret_cast<WindowAndroid*>(window_android_ptr));
135 return reinterpret_cast<jint>(tab); 138 return reinterpret_cast<jint>(tab);
136 } 139 }
137 140
138 int TestShellTab::GetSyncId() const { 141 int TestShellTab::GetSyncId() const {
139 NOTIMPLEMENTED(); 142 NOTIMPLEMENTED();
140 return 0; 143 return 0;
141 } 144 }
142 145
143 void TestShellTab::SetSyncId(int sync_id) { NOTIMPLEMENTED(); } 146 void TestShellTab::SetSyncId(int sync_id) { NOTIMPLEMENTED(); }
OLDNEW
« no previous file with comments | « chrome/android/testshell/testshell_tab.h ('k') | chrome/browser/android/chrome_web_contents_delegate_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698