Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: chrome/browser/guest_view/web_view/web_view_guest.cc

Issue 444813002: Remove BrowserPlugin's -internal-attach method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 90c46e771a598995c49411219696f64d038fe132..566345eb9d1ad0417cf14a2516dd84dfbfd4ceec 100644
--- a/chrome/browser/guest_view/web_view/web_view_guest.cc
+++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
@@ -292,7 +292,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.
@@ -302,15 +302,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()) {
@@ -1047,17 +1047,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.

Powered by Google App Engine
This is Rietveld 408576698