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

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

Issue 12082123: Rename JavaScriptDialogCreator to JavaScriptDialogManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 10 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 "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "chrome/browser/file_select_helper.h" 10 #include "chrome/browser/file_select_helper.h"
11 #include "chrome/browser/google/google_url_tracker.h" 11 #include "chrome/browser/google/google_url_tracker.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h" 13 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
14 #include "chrome/browser/ui/find_bar/find_match_rects_details.h" 14 #include "chrome/browser/ui/find_bar/find_match_rects_details.h"
15 #include "chrome/browser/ui/find_bar/find_notification_details.h" 15 #include "chrome/browser/ui/find_bar/find_notification_details.h"
16 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 16 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
17 #include "chrome/browser/ui/media_stream_infobar_delegate.h" 17 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
18 #include "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
19 #include "content/public/browser/android/download_controller_android.h" 19 #include "content/public/browser/android/download_controller_android.h"
20 #include "content/public/browser/navigation_entry.h" 20 #include "content/public/browser/navigation_entry.h"
21 #include "content/public/browser/notification_details.h" 21 #include "content/public/browser/notification_details.h"
22 #include "content/public/browser/notification_service.h" 22 #include "content/public/browser/notification_service.h"
23 #include "content/public/browser/notification_source.h" 23 #include "content/public/browser/notification_source.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 jrects.obj(), 251 jrects.obj(),
252 jactive_rect.obj())); 252 jactive_rect.obj()));
253 DCHECK(!details_object.is_null()); 253 DCHECK(!details_object.is_null());
254 254
255 Java_ChromeWebContentsDelegateAndroid_onFindMatchRectsAvailable( 255 Java_ChromeWebContentsDelegateAndroid_onFindMatchRectsAvailable(
256 env, 256 env,
257 obj.obj(), 257 obj.obj(),
258 details_object.obj()); 258 details_object.obj());
259 } 259 }
260 260
261 content::JavaScriptDialogCreator* 261 content::JavaScriptDialogManager*
262 ChromeWebContentsDelegateAndroid::GetJavaScriptDialogCreator() { 262 ChromeWebContentsDelegateAndroid::GetJavaScriptDialogManager() {
263 return GetJavaScriptDialogCreatorInstance(); 263 return GetJavaScriptDialogManagerInstance();
264 } 264 }
265 265
266 bool ChromeWebContentsDelegateAndroid::CanDownload( 266 bool ChromeWebContentsDelegateAndroid::CanDownload(
267 content::RenderViewHost* source, 267 content::RenderViewHost* source,
268 int request_id, 268 int request_id,
269 const std::string& request_method) { 269 const std::string& request_method) {
270 if (request_method == net::HttpRequestHeaders::kGetMethod) { 270 if (request_method == net::HttpRequestHeaders::kGetMethod) {
271 content::DownloadControllerAndroid::Get()->CreateGETDownload( 271 content::DownloadControllerAndroid::Get()->CreateGETDownload(
272 source, request_id); 272 source, request_id);
273 return false; 273 return false;
(...skipping 28 matching lines...) Expand all
302 302
303 void ChromeWebContentsDelegateAndroid::RequestMediaAccessPermission( 303 void ChromeWebContentsDelegateAndroid::RequestMediaAccessPermission(
304 content::WebContents* web_contents, 304 content::WebContents* web_contents,
305 const content::MediaStreamRequest& request, 305 const content::MediaStreamRequest& request,
306 const content::MediaResponseCallback& callback) { 306 const content::MediaResponseCallback& callback) {
307 MediaStreamInfoBarDelegate::Create(web_contents, request, callback); 307 MediaStreamInfoBarDelegate::Create(web_contents, request, callback);
308 } 308 }
309 309
310 } // namespace android 310 } // namespace android
311 } // namespace chrome 311 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_web_contents_delegate_android.h ('k') | chrome/browser/devtools/devtools_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698