diff options
| author | nasko <nasko@chromium.org> | 2015-07-02 13:44:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-02 20:44:53 +0000 |
| commit | 48321ca3c0182342dd6b660a925bba53e8c0e1b4 (patch) | |
| tree | b6a3c6164c7bde1bce87571108819d7919feb22a /android_webview | |
| parent | b68c27e0dfd59fe943aba065d724fcb8b565a679 (diff) | |
| download | chromium_src-48321ca3c0182342dd6b660a925bba53e8c0e1b4.zip chromium_src-48321ca3c0182342dd6b660a925bba53e8c0e1b4.tar.gz chromium_src-48321ca3c0182342dd6b660a925bba53e8c0e1b4.tar.bz2 | |
Replace base::string16 with std::string for frame names.
This is a follow up from https://codereview.chromium.org/1141453003/ to ensure that frame names are using std::string on the Chromium side. The conversion from UTF16 to UTF8 happens in the renderer process when the data comes from Blink and from there on it flows through as UTF8 std::string.
BUG=none
Review URL: https://codereview.chromium.org/1217183002
Cr-Commit-Position: refs/heads/master@{#337251}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/native/aw_web_contents_delegate.cc | 2 | ||||
| -rw-r--r-- | android_webview/native/aw_web_contents_delegate.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/native/aw_web_contents_delegate.cc index cd4d9cf..bc7e026 100644 --- a/android_webview/native/aw_web_contents_delegate.cc +++ b/android_webview/native/aw_web_contents_delegate.cc @@ -180,7 +180,7 @@ void AwWebContentsDelegate::NavigationStateChanged( void AwWebContentsDelegate::WebContentsCreated( WebContents* source_contents, int opener_render_frame_id, - const base::string16& frame_name, + const std::string& frame_name, const GURL& target_url, content::WebContents* new_contents) { AwContentsIoThreadClientImpl::RegisterPendingContents(new_contents); diff --git a/android_webview/native/aw_web_contents_delegate.h b/android_webview/native/aw_web_contents_delegate.h index e49587e..81695d0 100644 --- a/android_webview/native/aw_web_contents_delegate.h +++ b/android_webview/native/aw_web_contents_delegate.h @@ -43,7 +43,7 @@ class AwWebContentsDelegate content::InvalidateTypes changed_flags) override; void WebContentsCreated(content::WebContents* source_contents, int opener_render_frame_id, - const base::string16& frame_name, + const std::string& frame_name, const GURL& target_url, content::WebContents* new_contents) override; |