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

Unified Diff: android_webview/browser/aw_javascript_dialog_manager.cc

Issue 100453010: Add base:: to string16s in android_webview/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/aw_javascript_dialog_manager.h ('k') | android_webview/browser/aw_login_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/aw_javascript_dialog_manager.cc
diff --git a/android_webview/browser/aw_javascript_dialog_manager.cc b/android_webview/browser/aw_javascript_dialog_manager.cc
index 1690eac737267bf783518d26f797a974dfb6f8c3..630c7bfd7af03df9a97e5f78c64ebcf21fbb755f 100644
--- a/android_webview/browser/aw_javascript_dialog_manager.cc
+++ b/android_webview/browser/aw_javascript_dialog_manager.cc
@@ -19,8 +19,8 @@ void AwJavaScriptDialogManager::RunJavaScriptDialog(
const GURL& origin_url,
const std::string& accept_lang,
content::JavaScriptMessageType message_type,
- const string16& message_text,
- const string16& default_prompt_text,
+ const base::string16& message_text,
+ const base::string16& default_prompt_text,
const DialogClosedCallback& callback,
bool* did_suppress_message) {
AwContentsClientBridgeBase* bridge =
@@ -34,7 +34,7 @@ void AwJavaScriptDialogManager::RunJavaScriptDialog(
void AwJavaScriptDialogManager::RunBeforeUnloadDialog(
content::WebContents* web_contents,
- const string16& message_text,
+ const base::string16& message_text,
bool is_reload,
const DialogClosedCallback& callback) {
AwContentsClientBridgeBase* bridge =
« no previous file with comments | « android_webview/browser/aw_javascript_dialog_manager.h ('k') | android_webview/browser/aw_login_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698