| 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 cc73fa8e8e3f3201b95d0564dfe2e8bd127f65a5..2e0ace235a0d8c97248a1fdd70a7597fbe897d91 100644
|
| --- a/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| +++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| @@ -569,19 +569,6 @@ void WebViewGuest::Observe(int type,
|
| }
|
| }
|
|
|
| -void WebViewGuest::SetZoom(double zoom_factor) {
|
| - double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor);
|
| - content::HostZoomMap::SetZoomLevel(guest_web_contents(), zoom_level);
|
| -
|
| - scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| - args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_);
|
| - args->SetDouble(webview::kNewZoomFactor, zoom_factor);
|
| - DispatchEvent(
|
| - new GuestViewBase::Event(webview::kEventZoomChange, args.Pass()));
|
| -
|
| - current_zoom_factor_ = zoom_factor;
|
| -}
|
| -
|
| double WebViewGuest::GetZoom() {
|
| return current_zoom_factor_;
|
| }
|
| @@ -1268,6 +1255,19 @@ void WebViewGuest::SetName(const std::string& name) {
|
| Send(new ChromeViewMsg_SetName(routing_id(), name_));
|
| }
|
|
|
| +void WebViewGuest::SetZoom(double zoom_factor) {
|
| + double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor);
|
| + content::HostZoomMap::SetZoomLevel(guest_web_contents(), zoom_level);
|
| +
|
| + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| + args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_);
|
| + args->SetDouble(webview::kNewZoomFactor, zoom_factor);
|
| + DispatchEvent(
|
| + new GuestViewBase::Event(webview::kEventZoomChange, args.Pass()));
|
| +
|
| + current_zoom_factor_ = zoom_factor;
|
| +}
|
| +
|
| void WebViewGuest::Destroy() {
|
| if (!attached() && GetOpener())
|
| GetOpener()->pending_new_windows_.erase(this);
|
|
|