| Index: chrome/browser/guest_view/web_view/web_view_guest.cc
|
| diff --git a/chrome/browser/guest_view/web_view/web_view_guest.cc b/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| index 181749e767e0cb30256d2ffc42c6c111b3e2bfb9..a0a0b0574e9e4a0e3a62e1b16acd90bb95eb3036 100644
|
| --- a/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| +++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| @@ -290,7 +290,7 @@ void WebViewGuest::DidAttachToEmbedder() {
|
| SetUpAutoSize();
|
|
|
| std::string name;
|
| - if (extra_params()->GetString(webview::kName, &name)) {
|
| + if (attach_params()->GetString(webview::kName, &name)) {
|
| // If the guest window's name is empty, then the WebView tag's name is
|
| // assigned. Otherwise, the guest window's name takes precedence over the
|
| // WebView tag's name.
|
| @@ -300,15 +300,15 @@ void WebViewGuest::DidAttachToEmbedder() {
|
| ReportFrameNameChange(name_);
|
|
|
| std::string user_agent_override;
|
| - if (extra_params()->GetString(webview::kParameterUserAgentOverride,
|
| - &user_agent_override)) {
|
| + if (attach_params()->GetString(webview::kParameterUserAgentOverride,
|
| + &user_agent_override)) {
|
| SetUserAgentOverride(user_agent_override);
|
| } else {
|
| SetUserAgentOverride("");
|
| }
|
|
|
| std::string src;
|
| - if (extra_params()->GetString("src", &src) && !src.empty())
|
| + if (attach_params()->GetString("src", &src) && !src.empty())
|
| NavigateGuest(src);
|
|
|
| if (GetOpener()) {
|
| @@ -1046,17 +1046,17 @@ bool WebViewGuest::HandleKeyboardShortcuts(
|
| void WebViewGuest::SetUpAutoSize() {
|
| // Read the autosize parameters passed in from the embedder.
|
| bool auto_size_enabled = false;
|
| - extra_params()->GetBoolean(webview::kAttributeAutoSize, &auto_size_enabled);
|
| + attach_params()->GetBoolean(webview::kAttributeAutoSize, &auto_size_enabled);
|
|
|
| int max_height = 0;
|
| int max_width = 0;
|
| - extra_params()->GetInteger(webview::kAttributeMaxHeight, &max_height);
|
| - extra_params()->GetInteger(webview::kAttributeMaxWidth, &max_width);
|
| + attach_params()->GetInteger(webview::kAttributeMaxHeight, &max_height);
|
| + attach_params()->GetInteger(webview::kAttributeMaxWidth, &max_width);
|
|
|
| int min_height = 0;
|
| int min_width = 0;
|
| - extra_params()->GetInteger(webview::kAttributeMinHeight, &min_height);
|
| - extra_params()->GetInteger(webview::kAttributeMinWidth, &min_width);
|
| + attach_params()->GetInteger(webview::kAttributeMinHeight, &min_height);
|
| + attach_params()->GetInteger(webview::kAttributeMinWidth, &min_width);
|
|
|
| // Call SetAutoSize to apply all the appropriate validation and clipping of
|
| // values.
|
|
|