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

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

Issue 10907166: Upstream chromium side of modal dialogs for webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | 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/browser/android/chrome_web_contents_delegate_android.h" 5 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "chrome/browser/file_select_helper.h" 8 #include "chrome/browser/file_select_helper.h"
9 #include "chrome/browser/ui/find_bar/find_match_rects_details.h" 9 #include "chrome/browser/ui/find_bar/find_match_rects_details.h"
10 #include "chrome/browser/ui/find_bar/find_notification_details.h" 10 #include "chrome/browser/ui/find_bar/find_notification_details.h"
11 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 11 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
12 #include "chrome/browser/ui/tab_contents/tab_contents.h" 12 #include "chrome/browser/ui/tab_contents/tab_contents.h"
13 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
13 #include "chrome/common/chrome_notification_types.h" 14 #include "chrome/common/chrome_notification_types.h"
14 #include "content/public/browser/notification_details.h" 15 #include "content/public/browser/notification_details.h"
15 #include "content/public/browser/notification_service.h" 16 #include "content/public/browser/notification_service.h"
16 #include "content/public/browser/notification_source.h" 17 #include "content/public/browser/notification_source.h"
17 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
18 #include "content/public/common/file_chooser_params.h" 19 #include "content/public/common/file_chooser_params.h"
19 #include "jni/ChromeWebContentsDelegateAndroid_jni.h" 20 #include "jni/ChromeWebContentsDelegateAndroid_jni.h"
20 #include "ui/gfx/rect.h" 21 #include "ui/gfx/rect.h"
21 #include "ui/gfx/rect_f.h" 22 #include "ui/gfx/rect_f.h"
22 23
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 jrects.obj(), 223 jrects.obj(),
223 jactive_rect.obj())); 224 jactive_rect.obj()));
224 DCHECK(!details_object.is_null()); 225 DCHECK(!details_object.is_null());
225 226
226 Java_ChromeWebContentsDelegateAndroid_onFindMatchRectsAvailable( 227 Java_ChromeWebContentsDelegateAndroid_onFindMatchRectsAvailable(
227 env, 228 env,
228 obj.obj(), 229 obj.obj(),
229 details_object.obj()); 230 details_object.obj());
230 } 231 }
231 232
233 content::JavaScriptDialogCreator*
234 ChromeWebContentsDelegateAndroid::GetJavaScriptDialogCreator() {
235 return GetJavaScriptDialogCreatorInstance();
236 }
237
232 } // namespace android 238 } // namespace android
233 } // namespace chrome 239 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698