diff options
Diffstat (limited to 'chromium/chrome/browser/extensions/api/tabs/tabs_api.cc')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/tabs/tabs_api.cc | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/chromium/chrome/browser/extensions/api/tabs/tabs_api.cc b/chromium/chrome/browser/extensions/api/tabs/tabs_api.cc index 874af5d556c..07871d23ce0 100644 --- a/chromium/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chromium/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -92,6 +92,7 @@ #include "net/base/escape.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" +#include "third_party/blink/public/common/page/page_zoom.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/list_selection_model.h" #include "ui/base/ui_base_types.h" @@ -1357,15 +1358,13 @@ bool TabsUpdateFunction::UpdateURL(const std::string& url_string, NavigationController::LoadURLParams load_params(url); - // For the PDF extension, treat it as renderer-initiated so that it does not - // show in the omnibox until it commits. This avoids URL spoofs since urls - // can be opened on behalf of untrusted content. - // TODO(devlin|nasko): Make this the default for all extensions. - if (extension() && extension()->id() == extension_misc::kPdfExtensionId) { - load_params.is_renderer_initiated = true; - load_params.initiator_origin = url::Origin::Create( - Extension::GetBaseURLFromExtensionId(extension()->id())); - } + // Treat extension-initiated navigations as renderer-initiated so that the URL + // does not show in the omnibox until it commits. This avoids URL spoofs + // since URLs can be opened on behalf of untrusted content. + load_params.is_renderer_initiated = true; + load_params.initiator_origin = url::Origin::Create( + Extension::GetBaseURLFromExtensionId(extension()->id())); + web_contents_->GetController().LoadURLWithParams(load_params); DCHECK_EQ(url, @@ -1999,9 +1998,10 @@ ExtensionFunction::ResponseAction TabsSetZoomFunction::Run() { ZoomController* zoom_controller = ZoomController::FromWebContents(web_contents); - double zoom_level = params->zoom_factor > 0 - ? content::ZoomFactorToZoomLevel(params->zoom_factor) - : zoom_controller->GetDefaultZoomLevel(); + double zoom_level = + params->zoom_factor > 0 + ? blink::PageZoomFactorToZoomLevel(params->zoom_factor) + : zoom_controller->GetDefaultZoomLevel(); auto client = base::MakeRefCounted<ExtensionZoomRequestClient>(extension()); if (!zoom_controller->SetZoomLevelByClient(zoom_level, client)) { @@ -2026,7 +2026,7 @@ ExtensionFunction::ResponseAction TabsGetZoomFunction::Run() { double zoom_level = ZoomController::FromWebContents(web_contents)->GetZoomLevel(); - double zoom_factor = content::ZoomLevelToZoomFactor(zoom_level); + double zoom_factor = blink::PageZoomLevelToZoomFactor(zoom_level); return RespondNow(ArgumentList(tabs::GetZoom::Results::Create(zoom_factor))); } @@ -2100,8 +2100,9 @@ ExtensionFunction::ResponseAction TabsGetZoomSettingsFunction::Run() { ZoomController::ZoomMode zoom_mode = zoom_controller->zoom_mode(); api::tabs::ZoomSettings zoom_settings; ZoomModeToZoomSettings(zoom_mode, &zoom_settings); - zoom_settings.default_zoom_factor.reset(new double( - content::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel()))); + zoom_settings.default_zoom_factor.reset( + new double(blink::PageZoomLevelToZoomFactor( + zoom_controller->GetDefaultZoomLevel()))); return RespondNow( ArgumentList(api::tabs::GetZoomSettings::Results::Create(zoom_settings))); |