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 /ui | |
| 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 'ui')
| -rw-r--r-- | ui/keyboard/keyboard_controller_proxy.cc | 2 | ||||
| -rw-r--r-- | ui/views/controls/webview/web_dialog_view.cc | 2 | ||||
| -rw-r--r-- | ui/views/controls/webview/web_dialog_view.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ui/keyboard/keyboard_controller_proxy.cc b/ui/keyboard/keyboard_controller_proxy.cc index 6b6483c..3671b02 100644 --- a/ui/keyboard/keyboard_controller_proxy.cc +++ b/ui/keyboard/keyboard_controller_proxy.cc @@ -56,7 +56,7 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate, 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, content::SessionStorageNamespace* session_storage_namespace) override { diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc index 4a5a114..4b5e8b2 100644 --- a/ui/views/controls/webview/web_dialog_view.cc +++ b/ui/views/controls/webview/web_dialog_view.cc @@ -337,7 +337,7 @@ bool WebDialogView::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, content::SessionStorageNamespace* session_storage_namespace) { diff --git a/ui/views/controls/webview/web_dialog_view.h b/ui/views/controls/webview/web_dialog_view.h index 22550dd..dc6598d 100644 --- a/ui/views/controls/webview/web_dialog_view.h +++ b/ui/views/controls/webview/web_dialog_view.h @@ -116,7 +116,7 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView, 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, content::SessionStorageNamespace* session_storage_namespace) override; |