OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // Implements the Chrome Extensions WebNavigation API. | 5 // Implements the Chrome Extensions WebNavigation API. |
6 | 6 |
7 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" | 7 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 | 360 |
361 helpers::DispatchOnBeforeNavigate( | 361 helpers::DispatchOnBeforeNavigate( |
362 web_contents(), | 362 web_contents(), |
363 render_frame_host, | 363 render_frame_host, |
364 navigation_state_.GetUrl(render_frame_host)); | 364 navigation_state_.GetUrl(render_frame_host)); |
365 } | 365 } |
366 | 366 |
367 void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame( | 367 void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame( |
368 content::RenderFrameHost* render_frame_host, | 368 content::RenderFrameHost* render_frame_host, |
369 const GURL& url, | 369 const GURL& url, |
370 content::PageTransition transition_type) { | 370 ui::PageTransition transition_type) { |
371 content::RenderViewHost* render_view_host = | 371 content::RenderViewHost* render_view_host = |
372 render_frame_host->GetRenderViewHost(); | 372 render_frame_host->GetRenderViewHost(); |
373 DVLOG(2) << "DidCommitProvisionalLoad(" | 373 DVLOG(2) << "DidCommitProvisionalLoad(" |
374 << "render_view_host=" << render_view_host | 374 << "render_view_host=" << render_view_host |
375 << ", frame_num=" << render_frame_host->GetRoutingID() | 375 << ", frame_num=" << render_frame_host->GetRoutingID() |
376 << ", url=" << url << ")"; | 376 << ", url=" << url << ")"; |
377 if (render_view_host != render_view_host_ && | 377 if (render_view_host != render_view_host_ && |
378 render_view_host != pending_render_view_host_) | 378 render_view_host != pending_render_view_host_) |
379 return; | 379 return; |
380 | 380 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
416 transition_type); | 416 transition_type); |
417 } else if (is_history_state_modification) { | 417 } else if (is_history_state_modification) { |
418 helpers::DispatchOnCommitted( | 418 helpers::DispatchOnCommitted( |
419 web_navigation::OnHistoryStateUpdated::kEventName, | 419 web_navigation::OnHistoryStateUpdated::kEventName, |
420 web_contents(), | 420 web_contents(), |
421 render_frame_host, | 421 render_frame_host, |
422 navigation_state_.GetUrl(render_frame_host), | 422 navigation_state_.GetUrl(render_frame_host), |
423 transition_type); | 423 transition_type); |
424 } else { | 424 } else { |
425 if (navigation_state_.GetIsServerRedirected(render_frame_host)) { | 425 if (navigation_state_.GetIsServerRedirected(render_frame_host)) { |
426 transition_type = static_cast<content::PageTransition>( | 426 transition_type = ui::PageTransitionFromInt( |
427 transition_type | content::PAGE_TRANSITION_SERVER_REDIRECT); | 427 transition_type | ui::PAGE_TRANSITION_SERVER_REDIRECT); |
428 } | 428 } |
429 helpers::DispatchOnCommitted(web_navigation::OnCommitted::kEventName, | 429 helpers::DispatchOnCommitted(web_navigation::OnCommitted::kEventName, |
430 web_contents(), | 430 web_contents(), |
431 render_frame_host, | 431 render_frame_host, |
432 navigation_state_.GetUrl(render_frame_host), | 432 navigation_state_.GetUrl(render_frame_host), |
433 transition_type); | 433 transition_type); |
434 } | 434 } |
435 } | 435 } |
436 | 436 |
437 void WebNavigationTabObserver::DidFailProvisionalLoad( | 437 void WebNavigationTabObserver::DidFailProvisionalLoad( |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 content::RenderFrameHost::FromID(render_view_host->GetProcess()->GetID(), | 568 content::RenderFrameHost::FromID(render_view_host->GetProcess()->GetID(), |
569 details.render_frame_id); | 569 details.render_frame_id); |
570 navigation_state_.SetIsServerRedirected(render_frame_host); | 570 navigation_state_.SetIsServerRedirected(render_frame_host); |
571 } | 571 } |
572 | 572 |
573 void WebNavigationTabObserver::DidOpenRequestedURL( | 573 void WebNavigationTabObserver::DidOpenRequestedURL( |
574 content::WebContents* new_contents, | 574 content::WebContents* new_contents, |
575 const GURL& url, | 575 const GURL& url, |
576 const content::Referrer& referrer, | 576 const content::Referrer& referrer, |
577 WindowOpenDisposition disposition, | 577 WindowOpenDisposition disposition, |
578 content::PageTransition transition, | 578 ui::PageTransition transition, |
579 int64 source_frame_num) { | 579 int64 source_frame_num) { |
580 content::RenderFrameHost* render_frame_host = | 580 content::RenderFrameHost* render_frame_host = |
581 content::RenderFrameHost::FromID(render_view_host_->GetProcess()->GetID(), | 581 content::RenderFrameHost::FromID(render_view_host_->GetProcess()->GetID(), |
582 source_frame_num); | 582 source_frame_num); |
583 if (!navigation_state_.CanSendEvents(render_frame_host)) | 583 if (!navigation_state_.CanSendEvents(render_frame_host)) |
584 return; | 584 return; |
585 | 585 |
586 // We only send the onCreatedNavigationTarget if we end up creating a new | 586 // We only send the onCreatedNavigationTarget if we end up creating a new |
587 // window. | 587 // window. |
588 if (disposition != SINGLETON_TAB && | 588 if (disposition != SINGLETON_TAB && |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
770 return g_factory.Pointer(); | 770 return g_factory.Pointer(); |
771 } | 771 } |
772 | 772 |
773 void WebNavigationAPI::OnListenerAdded(const EventListenerInfo& details) { | 773 void WebNavigationAPI::OnListenerAdded(const EventListenerInfo& details) { |
774 web_navigation_event_router_.reset(new WebNavigationEventRouter( | 774 web_navigation_event_router_.reset(new WebNavigationEventRouter( |
775 Profile::FromBrowserContext(browser_context_))); | 775 Profile::FromBrowserContext(browser_context_))); |
776 EventRouter::Get(browser_context_)->UnregisterObserver(this); | 776 EventRouter::Get(browser_context_)->UnregisterObserver(this); |
777 } | 777 } |
778 | 778 |
779 } // namespace extensions | 779 } // namespace extensions |
OLD | NEW |