diff options
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; |