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 /content/public/browser/web_contents_delegate.cc | |
| 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 'content/public/browser/web_contents_delegate.cc')
| -rw-r--r-- | content/public/browser/web_contents_delegate.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc index 70f12f6..016097b 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc @@ -135,7 +135,7 @@ bool WebContentsDelegate::ShouldCreateWebContents( int route_id, int main_frame_route_id, WindowContainerType window_container_type, - const base::string16& frame_name, + const std::string& frame_name, const GURL& target_url, const std::string& partition_id, SessionStorageNamespace* session_storage_namespace) { |