| Index: extensions/browser/guest_view/web_view/web_view_guest.cc
|
| diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
|
| index aea5054fe69f6dbcc9ce5ad95355e0754ec7a330..6d3f6179cd10fae373401f12fc99eab1ca8d619f 100644
|
| --- a/extensions/browser/guest_view/web_view/web_view_guest.cc
|
| +++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
|
| @@ -236,7 +236,7 @@ void WebViewGuest::CleanUp(content::BrowserContext* browser_context,
|
| }
|
|
|
| // static
|
| -GuestViewBase* WebViewGuest::Create(content::WebContents* owner_web_contents) {
|
| +GuestViewBase* WebViewGuest::Create(WebContents* owner_web_contents) {
|
| return new WebViewGuest(owner_web_contents);
|
| }
|
|
|
| @@ -540,13 +540,12 @@ void WebViewGuest::HandleKeyboardEvent(
|
| GuestViewBase::HandleKeyboardEvent(source, event);
|
| }
|
|
|
| -bool WebViewGuest::PreHandleGestureEvent(content::WebContents* source,
|
| +bool WebViewGuest::PreHandleGestureEvent(WebContents* source,
|
| const blink::WebGestureEvent& event) {
|
| return !allow_scaling_ && GuestViewBase::PreHandleGestureEvent(source, event);
|
| }
|
|
|
| -void WebViewGuest::LoadProgressChanged(content::WebContents* source,
|
| - double progress) {
|
| +void WebViewGuest::LoadProgressChanged(WebContents* source, double progress) {
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| args->SetString(guest_view::kUrl, web_contents()->GetURL().spec());
|
| args->SetDouble(webview::kProgress, progress);
|
| @@ -588,9 +587,8 @@ void WebViewGuest::CreateNewGuestWebViewWindow(
|
| params));
|
| }
|
|
|
| -void WebViewGuest::NewGuestWebViewCallback(
|
| - const content::OpenURLParams& params,
|
| - content::WebContents* guest_web_contents) {
|
| +void WebViewGuest::NewGuestWebViewCallback(const content::OpenURLParams& params,
|
| + WebContents* guest_web_contents) {
|
| WebViewGuest* new_guest = WebViewGuest::FromWebContents(guest_web_contents);
|
| new_guest->SetOpener(this);
|
|
|
| @@ -607,7 +605,7 @@ void WebViewGuest::NewGuestWebViewCallback(
|
|
|
| // TODO(fsamuel): Find a reliable way to test the 'responsive' and
|
| // 'unresponsive' events.
|
| -void WebViewGuest::RendererResponsive(content::WebContents* source) {
|
| +void WebViewGuest::RendererResponsive(WebContents* source) {
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| args->SetInteger(webview::kProcessId,
|
| web_contents()->GetRenderProcessHost()->GetID());
|
| @@ -615,7 +613,7 @@ void WebViewGuest::RendererResponsive(content::WebContents* source) {
|
| new GuestViewEvent(webview::kEventResponsive, args.Pass()));
|
| }
|
|
|
| -void WebViewGuest::RendererUnresponsive(content::WebContents* source) {
|
| +void WebViewGuest::RendererUnresponsive(WebContents* source) {
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| args->SetInteger(webview::kProcessId,
|
| web_contents()->GetRenderProcessHost()->GetID());
|
| @@ -738,7 +736,7 @@ bool WebViewGuest::ClearData(base::Time remove_since,
|
| return true;
|
| }
|
|
|
| -WebViewGuest::WebViewGuest(content::WebContents* owner_web_contents)
|
| +WebViewGuest::WebViewGuest(WebContents* owner_web_contents)
|
| : GuestView<WebViewGuest>(owner_web_contents),
|
| rules_registry_id_(RulesRegistryService::kInvalidRulesRegistryID),
|
| find_helper_(this),
|
| @@ -923,7 +921,7 @@ void WebViewGuest::RemoveWebViewStateFromIOThread(
|
| }
|
|
|
| void WebViewGuest::RequestMediaAccessPermission(
|
| - content::WebContents* source,
|
| + WebContents* source,
|
| const content::MediaStreamRequest& request,
|
| const content::MediaResponseCallback& callback) {
|
| web_view_permission_helper_->RequestMediaAccessPermission(source,
|
| @@ -931,7 +929,7 @@ void WebViewGuest::RequestMediaAccessPermission(
|
| callback);
|
| }
|
|
|
| -bool WebViewGuest::CheckMediaAccessPermission(content::WebContents* source,
|
| +bool WebViewGuest::CheckMediaAccessPermission(WebContents* source,
|
| const GURL& security_origin,
|
| content::MediaStreamType type) {
|
| return web_view_permission_helper_->CheckMediaAccessPermission(
|
| @@ -1198,8 +1196,8 @@ bool WebViewGuest::LoadDataWithBaseURL(const std::string& data_url,
|
| return true;
|
| }
|
|
|
| -void WebViewGuest::AddNewContents(content::WebContents* source,
|
| - content::WebContents* new_contents,
|
| +void WebViewGuest::AddNewContents(WebContents* source,
|
| + WebContents* new_contents,
|
| WindowOpenDisposition disposition,
|
| const gfx::Rect& initial_rect,
|
| bool user_gesture,
|
| @@ -1212,8 +1210,8 @@ void WebViewGuest::AddNewContents(content::WebContents* source,
|
| new_contents);
|
| }
|
|
|
| -content::WebContents* WebViewGuest::OpenURLFromTab(
|
| - content::WebContents* source,
|
| +WebContents* WebViewGuest::OpenURLFromTab(
|
| + WebContents* source,
|
| const content::OpenURLParams& params) {
|
| // Most navigations should be handled by WebViewGuest::LoadURLWithParams,
|
| // which takes care of blocking chrome:// URLs and other web-unsafe schemes.
|
| @@ -1280,7 +1278,7 @@ void WebViewGuest::WebContentsCreated(WebContents* source_contents,
|
| int opener_render_frame_id,
|
| const std::string& frame_name,
|
| const GURL& target_url,
|
| - content::WebContents* new_contents) {
|
| + WebContents* new_contents) {
|
| auto guest = WebViewGuest::FromWebContents(new_contents);
|
| CHECK(guest);
|
| guest->SetOpener(this);
|
| @@ -1289,7 +1287,7 @@ void WebViewGuest::WebContentsCreated(WebContents* source_contents,
|
| std::make_pair(guest, NewWindowInfo(target_url, frame_name)));
|
| }
|
|
|
| -void WebViewGuest::EnterFullscreenModeForTab(content::WebContents* web_contents,
|
| +void WebViewGuest::EnterFullscreenModeForTab(WebContents* web_contents,
|
| const GURL& origin) {
|
| // Ask the embedder for permission.
|
| base::DictionaryValue request_info;
|
| @@ -1309,13 +1307,12 @@ void WebViewGuest::EnterFullscreenModeForTab(content::WebContents* web_contents,
|
| SetFullscreenState(true);
|
| }
|
|
|
| -void WebViewGuest::ExitFullscreenModeForTab(
|
| - content::WebContents* web_contents) {
|
| +void WebViewGuest::ExitFullscreenModeForTab(WebContents* web_contents) {
|
| SetFullscreenState(false);
|
| }
|
|
|
| bool WebViewGuest::IsFullscreenForTabOrPending(
|
| - const content::WebContents* web_contents) const {
|
| + const WebContents* web_contents) const {
|
| return is_guest_fullscreen_;
|
| }
|
|
|
| @@ -1371,11 +1368,10 @@ void WebViewGuest::LoadURLWithParams(
|
| src_ = validated_url;
|
| }
|
|
|
| -void WebViewGuest::RequestNewWindowPermission(
|
| - WindowOpenDisposition disposition,
|
| - const gfx::Rect& initial_bounds,
|
| - bool user_gesture,
|
| - content::WebContents* new_contents) {
|
| +void WebViewGuest::RequestNewWindowPermission(WindowOpenDisposition disposition,
|
| + const gfx::Rect& initial_bounds,
|
| + bool user_gesture,
|
| + WebContents* new_contents) {
|
| auto guest = WebViewGuest::FromWebContents(new_contents);
|
| if (!guest)
|
| return;
|
|
|