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

Side by Side Diff: android_webview/browser/aw_contents_client_bridge_base.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
6 #define ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_ 6 #define ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
7 7
8 #include "base/callback_forward.h" 8 #include "base/callback_forward.h"
9 #include "base/supports_user_data.h" 9 #include "base/supports_user_data.h"
10 #include "content/public/browser/javascript_dialog_manager.h" 10 #include "content/public/browser/javascript_dialog_manager.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 const base::Callback<void(bool)>& callback, 44 const base::Callback<void(bool)>& callback,
45 bool* cancel_request) = 0; 45 bool* cancel_request) = 0;
46 46
47 virtual void RunJavaScriptDialog( 47 virtual void RunJavaScriptDialog(
48 content::JavaScriptMessageType message_type, 48 content::JavaScriptMessageType message_type,
49 const GURL& origin_url, 49 const GURL& origin_url,
50 const string16& message_text, 50 const string16& message_text,
51 const string16& default_prompt_text, 51 const string16& default_prompt_text,
52 const content::JavaScriptDialogManager::DialogClosedCallback& callback) 52 const content::JavaScriptDialogManager::DialogClosedCallback& callback)
53 = 0; 53 = 0;
54
54 virtual void RunBeforeUnloadDialog( 55 virtual void RunBeforeUnloadDialog(
55 const GURL& origin_url, 56 const GURL& origin_url,
56 const string16& message_text, 57 const string16& message_text,
57 const content::JavaScriptDialogManager::DialogClosedCallback& callback) 58 const content::JavaScriptDialogManager::DialogClosedCallback& callback)
58 = 0; 59 = 0;
60
61 virtual bool ShouldOverrideUrlLoading(const base::string16& url) = 0;
59 }; 62 };
60 63
61 } // namespace android_webview 64 } // namespace android_webview
62 65
63 #endif // ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_ 66 #endif // ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698