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

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

Issue 24228003: Upstream ShouldOverrideUrlLoading changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed a non-related line to keep chrome bots happy Created 7 years 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
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 ANDROID_WEBVIEW_NATIVE_AW_WEB_CONTENTS_DELEGATE_H_ 5 #ifndef ANDROID_WEBVIEW_NATIVE_AW_WEB_CONTENTS_DELEGATE_H_
6 #define ANDROID_WEBVIEW_NATIVE_AW_WEB_CONTENTS_DELEGATE_H_ 6 #define ANDROID_WEBVIEW_NATIVE_AW_WEB_CONTENTS_DELEGATE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "components/web_contents_delegate_android/web_contents_delegate_android .h" 10 #include "components/web_contents_delegate_android/web_contents_delegate_android .h"
(...skipping 22 matching lines...) Expand all
33 const base::Callback<void(bool)>& callback) OVERRIDE; 33 const base::Callback<void(bool)>& callback) OVERRIDE;
34 virtual void RunFileChooser( 34 virtual void RunFileChooser(
35 content::WebContents* web_contents, 35 content::WebContents* web_contents,
36 const content::FileChooserParams& params) OVERRIDE; 36 const content::FileChooserParams& params) OVERRIDE;
37 virtual void AddNewContents(content::WebContents* source, 37 virtual void AddNewContents(content::WebContents* source,
38 content::WebContents* new_contents, 38 content::WebContents* new_contents,
39 WindowOpenDisposition disposition, 39 WindowOpenDisposition disposition,
40 const gfx::Rect& initial_pos, 40 const gfx::Rect& initial_pos,
41 bool user_gesture, 41 bool user_gesture,
42 bool* was_blocked) OVERRIDE; 42 bool* was_blocked) OVERRIDE;
43
44 virtual void WebContentsCreated(content::WebContents* source_contents,
45 int64 source_frame_id,
46 const string16& frame_name,
47 const GURL& target_url,
48 content::WebContents* new_contents) OVERRIDE;
49
43 virtual void CloseContents(content::WebContents* source) OVERRIDE; 50 virtual void CloseContents(content::WebContents* source) OVERRIDE;
44 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; 51 virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
45 virtual void RequestProtectedMediaIdentifierPermission( 52 virtual void RequestProtectedMediaIdentifierPermission(
46 const content::WebContents* web_contents, 53 const content::WebContents* web_contents,
47 const GURL& frame_url, 54 const GURL& frame_url,
48 const base::Callback<void(bool)>& callback) OVERRIDE; 55 const base::Callback<void(bool)>& callback) OVERRIDE;
49 }; 56 };
50 57
51 bool RegisterAwWebContentsDelegate(JNIEnv* env); 58 bool RegisterAwWebContentsDelegate(JNIEnv* env);
52 59
53 } // namespace android_webview 60 } // namespace android_webview
54 61
55 #endif // ANDROID_WEBVIEW_NATIVE_AW_WEB_CONTENTS_DELEGATE_H_ 62 #endif // ANDROID_WEBVIEW_NATIVE_AW_WEB_CONTENTS_DELEGATE_H_
OLDNEW
« no previous file with comments | « android_webview/native/aw_contents_client_bridge.cc ('k') | android_webview/native/aw_web_contents_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698