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

Side by Side Diff: android_webview/native/aw_web_contents_delegate.cc

Issue 2723253002: Fix beep when navigating/closing a page with find bar open
Patch Set: android Created 3 years, 9 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
« no previous file with comments | « android_webview/native/aw_web_contents_delegate.h ('k') | chrome/browser/ui/browser.h » ('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 #include "android_webview/native/aw_web_contents_delegate.h" 5 #include "android_webview/native/aw_web_contents_delegate.h"
6 6
7 #include "android_webview/browser/aw_javascript_dialog_manager.h" 7 #include "android_webview/browser/aw_javascript_dialog_manager.h"
8 #include "android_webview/browser/find_helper.h" 8 #include "android_webview/browser/find_helper.h"
9 #include "android_webview/native/aw_contents.h" 9 #include "android_webview/native/aw_contents.h"
10 #include "android_webview/native/aw_contents_io_thread_client_impl.h" 10 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 content::JavaScriptDialogManager* 65 content::JavaScriptDialogManager*
66 AwWebContentsDelegate::GetJavaScriptDialogManager(WebContents* source) { 66 AwWebContentsDelegate::GetJavaScriptDialogManager(WebContents* source) {
67 return g_javascript_dialog_manager.Pointer(); 67 return g_javascript_dialog_manager.Pointer();
68 } 68 }
69 69
70 void AwWebContentsDelegate::FindReply(WebContents* web_contents, 70 void AwWebContentsDelegate::FindReply(WebContents* web_contents,
71 int request_id, 71 int request_id,
72 int number_of_matches, 72 int number_of_matches,
73 const gfx::Rect& selection_rect, 73 const gfx::Rect& selection_rect,
74 int active_match_ordinal, 74 int active_match_ordinal,
75 bool final_update) { 75 bool final_update,
76 bool was_frame_removal) {
76 AwContents* aw_contents = AwContents::FromWebContents(web_contents); 77 AwContents* aw_contents = AwContents::FromWebContents(web_contents);
77 if (!aw_contents) 78 if (!aw_contents)
78 return; 79 return;
79 80
80 aw_contents->GetFindHelper()->HandleFindReply(request_id, 81 aw_contents->GetFindHelper()->HandleFindReply(request_id,
81 number_of_matches, 82 number_of_matches,
82 active_match_ordinal, 83 active_match_ordinal,
83 final_update); 84 final_update);
84 } 85 }
85 86
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 DVLOG(0) << "File Chooser result: mode = " << mode 314 DVLOG(0) << "File Chooser result: mode = " << mode
314 << ", file paths = " << base::JoinString(file_path_str, ":"); 315 << ", file paths = " << base::JoinString(file_path_str, ":");
315 rfh->FilesSelectedInChooser(files, mode); 316 rfh->FilesSelectedInChooser(files, mode);
316 } 317 }
317 318
318 bool RegisterAwWebContentsDelegate(JNIEnv* env) { 319 bool RegisterAwWebContentsDelegate(JNIEnv* env) {
319 return RegisterNativesImpl(env); 320 return RegisterNativesImpl(env);
320 } 321 }
321 322
322 } // namespace android_webview 323 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/aw_web_contents_delegate.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698