diff options
49 files changed, 223 insertions, 150 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index aced400..37307d8 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -48,7 +48,7 @@ include_rules = [ "-content/common/gamepad_messages.h", # TODO(jam) "-content/common/geolocation_messages.h", "-content/common/indexed_db_messages.h", - "-content/common/intents_messages.h", + # TODO(jam) "-content/common/intents_messages.h", "-content/common/java_bridge_messages.h", "-content/common/mime_registry_messages.h", "-content/common/p2p_messages.h", diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc index 490d800..012297f 100644 --- a/chrome/browser/autofill/autofill_manager.cc +++ b/chrome/browser/autofill/autofill_manager.cc @@ -289,7 +289,7 @@ void AutofillManager::RegisterUserPrefs(PrefService* prefs) { void AutofillManager::DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { Reset(); } diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h index 8d9b134..2217dc9 100644 --- a/chrome/browser/autofill/autofill_manager.h +++ b/chrome/browser/autofill/autofill_manager.h @@ -135,7 +135,7 @@ class AutofillManager : public TabContentsObserver, // TabContentsObserver: virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // AutofillDownloadManager::Observer: diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index d441bb8..16f42c5 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -422,7 +422,7 @@ bool TabSpecificContentSettings::OnMessageReceived( void TabSpecificContentSettings::DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { if (!details.is_in_page) { // Clear "blocked" flags. ClearBlockedContentSettingsExceptForCookies(); diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h index 40d1069..90ea6b7 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.h +++ b/chrome/browser/content_settings/tab_specific_content_settings.h @@ -162,7 +162,7 @@ class TabSpecificContentSettings : public TabContentsObserver, virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; virtual void DidStartProvisionalLoadForFrame( int64 frame_id, bool is_main_frame, diff --git a/chrome/browser/extensions/extension_tab_helper.cc b/chrome/browser/extensions/extension_tab_helper.cc index 3456a53..1d1aa08 100644 --- a/chrome/browser/extensions/extension_tab_helper.cc +++ b/chrome/browser/extensions/extension_tab_helper.cc @@ -87,7 +87,7 @@ SkBitmap* ExtensionTabHelper::GetExtensionAppIcon() { void ExtensionTabHelper::DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { if (details.is_in_page) return; diff --git a/chrome/browser/extensions/extension_tab_helper.h b/chrome/browser/extensions/extension_tab_helper.h index 20f623a..7310aaa 100644 --- a/chrome/browser/extensions/extension_tab_helper.h +++ b/chrome/browser/extensions/extension_tab_helper.h @@ -91,7 +91,7 @@ class ExtensionTabHelper // TabContentsObserver overrides. virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // ExtensionFunctionDispatcher::Delegate overrides. diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index bd33525..f88e96e 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -40,10 +40,10 @@ #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/provisional_load_details.h" -#include "content/common/view_messages.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_service.h" #include "content/public/common/bindings_policy.h" +#include "content/public/common/frame_navigate_params.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/page_zoom.h" #include "grit/generated_resources.h" @@ -365,7 +365,7 @@ TabContents* ExternalTabContainer::OpenURLFromTab(TabContents* source, // We should populate other fields in the // ViewHostMsg_FrameNavigate_Params structure. Another option could be // to refactor the UpdateHistoryForNavigation function in TabContents. - ViewHostMsg_FrameNavigate_Params nav_params; + content::FrameNavigateParams nav_params; nav_params.referrer = params.referrer; nav_params.url = params.url; nav_params.page_id = -1; diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc index 3501893..e19f2a7 100644 --- a/chrome/browser/favicon/favicon_tab_helper.cc +++ b/chrome/browser/favicon/favicon_tab_helper.cc @@ -159,7 +159,7 @@ void FaviconTabHelper::NavigateToPendingEntry( void FaviconTabHelper::DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { // Get the favicon, either from history or request it from the net. FetchFavicon(details.entry->url()); } diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h index 0bb0c1e..bd9c3a1 100644 --- a/chrome/browser/favicon/favicon_tab_helper.h +++ b/chrome/browser/favicon/favicon_tab_helper.h @@ -85,7 +85,7 @@ class FaviconTabHelper : public TabContentsObserver, NavigationController::ReloadType reload_type) OVERRIDE; virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void OnDidDownloadFavicon(int id, diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc index e519fd8..ee04f6c 100644 --- a/chrome/browser/history/history_tab_helper.cc +++ b/chrome/browser/history/history_tab_helper.cc @@ -13,10 +13,11 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/browser/tab_contents/title_updated_details.h" -#include "content/common/view_messages.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/notification_details.h" +#include "content/public/common/frame_navigate_params.h" HistoryTabHelper::HistoryTabHelper(TabContents* tab_contents) : TabContentsObserver(tab_contents), @@ -45,7 +46,7 @@ scoped_refptr<history::HistoryAddPageArgs> HistoryTabHelper::CreateHistoryAddPageArgs( const GURL& virtual_url, const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { scoped_refptr<history::HistoryAddPageArgs> add_page_args( new history::HistoryAddPageArgs( params.url, base::Time::Now(), tab_contents(), params.page_id, @@ -79,14 +80,14 @@ bool HistoryTabHelper::OnMessageReceived(const IPC::Message& message) { void HistoryTabHelper::DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { // Allow the new page to set the title again. received_page_title_ = false; } void HistoryTabHelper::DidNavigateAnyFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { // Update history. Note that this needs to happen after the entry is complete, // which WillNavigate[Main,Sub]Frame will do before this function is called. if (!params.should_update_history) diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h index b5f83ef..63db2b0 100644 --- a/chrome/browser/history/history_tab_helper.h +++ b/chrome/browser/history/history_tab_helper.h @@ -38,17 +38,17 @@ class HistoryTabHelper : public TabContentsObserver, scoped_refptr<history::HistoryAddPageArgs> CreateHistoryAddPageArgs( const GURL& virtual_url, const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params); + const content::FrameNavigateParams& params); private: // TabContentsObserver implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; virtual void DidNavigateAnyFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; // content::NotificationObserver implementation. virtual void Observe(int type, diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index 237c960..7d713fb 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -16,7 +16,7 @@ #include "chrome/common/autofill_messages.h" #include "chrome/common/pref_names.h" #include "content/browser/user_metrics.h" -#include "content/common/view_messages.h" +#include "content/public/common/frame_navigate_params.h" #include "grit/generated_resources.h" using webkit_glue::PasswordForm; @@ -159,7 +159,7 @@ void PasswordManager::DidStopLoading() { void PasswordManager::DidNavigateAnyFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { if (params.password_form.origin.is_valid()) ProvisionallySavePassword(params.password_form); } diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h index ec9f3f9..2b44000 100644 --- a/chrome/browser/password_manager/password_manager.h +++ b/chrome/browser/password_manager/password_manager.h @@ -53,7 +53,7 @@ class PasswordManager : public LoginModel, virtual void DidStopLoading() OVERRIDE; virtual void DidNavigateAnyFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void OnPasswordFormsFound( diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index c8af93b..a1cae4a2 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -30,7 +30,6 @@ #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_service.h" -#include "content/common/view_messages.h" #include "ui/gfx/rect.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h index 22020de..e6b7c39 100644 --- a/chrome/browser/prerender/prerender_contents.h +++ b/chrome/browser/prerender/prerender_contents.h @@ -24,7 +24,6 @@ class SessionStorageNamespace; class TabContents; class TabContentsWrapper; struct FaviconURL; -struct ViewHostMsg_FrameNavigate_Params; namespace base { class ProcessMetrics; @@ -94,10 +93,6 @@ class PrerenderContents : public content::NotificationObserver, RenderViewHost* render_view_host_mutable(); const RenderViewHost* render_view_host() const; - - ViewHostMsg_FrameNavigate_Params* navigate_params() { - return navigate_params_.get(); - } string16 title() const { return title_; } int32 page_id() const { return page_id_; } GURL icon_url() const { return icon_url_; } @@ -243,9 +238,6 @@ class PrerenderContents : public content::NotificationObserver, // The referrer. GURL referrer_; - // The NavigationParameters of the finished navigation. - scoped_ptr<ViewHostMsg_FrameNavigate_Params> navigate_params_; - // The profile being used Profile* profile_; diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc index d3edca3..a3a60be 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -27,12 +27,12 @@ #include "content/browser/renderer_host/resource_request_details.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/view_messages.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/common/frame_navigate_params.h" #include "googleurl/src/gurl.h" using content::BrowserThread; @@ -50,7 +50,7 @@ class ClientSideDetectionHost::ShouldClassifyUrlRequest : public base::RefCountedThreadSafe< ClientSideDetectionHost::ShouldClassifyUrlRequest> { public: - ShouldClassifyUrlRequest(const ViewHostMsg_FrameNavigate_Params& params, + ShouldClassifyUrlRequest(const content::FrameNavigateParams& params, TabContents* tab_contents, ClientSideDetectionService* csd_service, SafeBrowsingService* sb_service, @@ -214,7 +214,7 @@ class ClientSideDetectionHost::ShouldClassifyUrlRequest // No need to protect |canceled_| with a lock because it is only read and // written by the UI thread. bool canceled_; - ViewHostMsg_FrameNavigate_Params params_; + content::FrameNavigateParams params_; TabContents* tab_contents_; ClientSideDetectionService* csd_service_; // We keep a ref pointer here just to make sure the service class stays alive @@ -292,7 +292,7 @@ bool ClientSideDetectionHost::OnMessageReceived(const IPC::Message& message) { void ClientSideDetectionHost::DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { // TODO(noelutz): move this DCHECK to TabContents and fix all the unit tests // that don't call this method on the UI thread. // DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/chrome/browser/safe_browsing/client_side_detection_host.h b/chrome/browser/safe_browsing/client_side_detection_host.h index 3d2401d..a45a986 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.h +++ b/chrome/browser/safe_browsing/client_side_detection_host.h @@ -48,7 +48,7 @@ class ClientSideDetectionHost : public TabContentsObserver, // we should classify the new URL. virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; // Called when the SafeBrowsingService found a hit with one of the // SafeBrowsing lists. This method is called on the UI thread. diff --git a/chrome/browser/tabs/tab_finder.cc b/chrome/browser/tabs/tab_finder.cc index cfa807f..b84fb1f 100644 --- a/chrome/browser/tabs/tab_finder.cc +++ b/chrome/browser/tabs/tab_finder.cc @@ -19,9 +19,9 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_observer.h" #include "content/public/browser/notification_service.h" -#include "content/common/view_messages.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/public/common/frame_navigate_params.h" #include "content/public/common/page_transition_types.h" class TabFinder::TabContentsObserverImpl : public TabContentsObserver { @@ -34,7 +34,7 @@ class TabFinder::TabContentsObserverImpl : public TabContentsObserver { // TabContentsObserver overrides: virtual void DidNavigateAnyFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE; private: @@ -55,7 +55,7 @@ TabFinder::TabContentsObserverImpl::~TabContentsObserverImpl() { void TabFinder::TabContentsObserverImpl::DidNavigateAnyFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { finder_->DidNavigateAnyFrame(tab_contents(), details, params); } @@ -133,7 +133,7 @@ TabFinder::~TabFinder() { void TabFinder::DidNavigateAnyFrame( TabContents* source, const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { CancelRequestsFor(source); if (content::PageTransitionIsRedirect(params.transition)) { diff --git a/chrome/browser/tabs/tab_finder.h b/chrome/browser/tabs/tab_finder.h index 02fd233..32b0f50 100644 --- a/chrome/browser/tabs/tab_finder.h +++ b/chrome/browser/tabs/tab_finder.h @@ -19,9 +19,9 @@ class Browser; class GURL; class TabContents; -struct ViewHostMsg_FrameNavigate_Params; namespace content { +struct FrameNavigateParams; struct LoadCommittedDetails; } @@ -65,7 +65,7 @@ class TabFinder : public content::NotificationObserver { void DidNavigateAnyFrame( TabContents* source, const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params); + const content::FrameNavigateParams& params); // Returns true if the tab's current url is |url|, or the start of the // redirect chain for the tab is |url|. diff --git a/chrome/browser/translate/translate_tab_helper.cc b/chrome/browser/translate/translate_tab_helper.cc index 8ffe1e8..ba39a3c 100644 --- a/chrome/browser/translate/translate_tab_helper.cc +++ b/chrome/browser/translate/translate_tab_helper.cc @@ -32,7 +32,7 @@ bool TranslateTabHelper::OnMessageReceived(const IPC::Message& message) { void TranslateTabHelper::DidNavigateAnyFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { // Let the LanguageState clear its state. language_state_.DidNavigate(details); } diff --git a/chrome/browser/translate/translate_tab_helper.h b/chrome/browser/translate/translate_tab_helper.h index 674f870..86e6d7a 100644 --- a/chrome/browser/translate/translate_tab_helper.h +++ b/chrome/browser/translate/translate_tab_helper.h @@ -22,7 +22,7 @@ class TranslateTabHelper : public TabContentsObserver { virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void DidNavigateAnyFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; void OnLanguageDetermined(const std::string& language, bool page_translatable); diff --git a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc index abdc31d..fc24f03 100644 --- a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc +++ b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc @@ -28,7 +28,7 @@ BlockedContentTabHelper::~BlockedContentTabHelper() { void BlockedContentTabHelper::DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { // Clear all page actions, blocked content notifications and browser actions // for this tab, unless this is an in-page navigation. if (!details.is_in_page) { diff --git a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h index d2f8788a..1b447e8e 100644 --- a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h +++ b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h @@ -58,7 +58,7 @@ class BlockedContentTabHelper : public TabContentsObserver { // TabContentsObserver overrides: virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; private: // Called when the blocked popup notification is shown or hidden. diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc index 9f6b58a..5e22dee 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc @@ -62,7 +62,7 @@ bool BookmarkTabHelper::ShouldShowBookmarkBar() { void BookmarkTabHelper::DidNavigateMainFrame( const content::LoadCommittedDetails& /*details*/, - const ViewHostMsg_FrameNavigate_Params& /*params*/) { + const content::FrameNavigateParams& /*params*/) { UpdateStarredStateForCurrentURL(); } diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h index 55b0b06..800ae4c 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h @@ -45,7 +45,7 @@ class BookmarkTabHelper : public content::NotificationObserver, // TabContentsObserver overrides: virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; // content::NotificationObserver overrides: virtual void Observe(int type, diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 7dde58b..04b6ebc 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -4,6 +4,9 @@ #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h" +#import <Carbon/Carbon.h> +#import <Foundation/NSAppleEventDescriptor.h> + #include "base/file_path.h" #include "base/logging.h" #import "base/memory/scoped_nsobject.h" @@ -20,7 +23,6 @@ #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents_delegate.h" -#include "content/common/view_messages.h" #include "googleurl/src/gurl.h" @interface AnyResultValue : NSObject { diff --git a/chrome/browser/ui/constrained_window_tab_helper.cc b/chrome/browser/ui/constrained_window_tab_helper.cc index 271e165..92acd63 100644 --- a/chrome/browser/ui/constrained_window_tab_helper.cc +++ b/chrome/browser/ui/constrained_window_tab_helper.cc @@ -87,7 +87,7 @@ void ConstrainedWindowTabHelper::BlockTabContent(bool blocked) { void ConstrainedWindowTabHelper::DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { // Close constrained windows if necessary. if (!net::RegistryControlledDomainService::SameDomainOrHost( details.previous_url, details.entry->url())) diff --git a/chrome/browser/ui/constrained_window_tab_helper.h b/chrome/browser/ui/constrained_window_tab_helper.h index f02c556..c65cd94 100644 --- a/chrome/browser/ui/constrained_window_tab_helper.h +++ b/chrome/browser/ui/constrained_window_tab_helper.h @@ -55,7 +55,7 @@ class ConstrainedWindowTabHelper : public TabContentsObserver { // Overridden from TabContentsObserver: virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; virtual void DidGetIgnoredUIEvent() OVERRIDE; virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE; diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc index b35444e..0e8e2c9 100644 --- a/chrome/browser/ui/intents/web_intent_picker_controller.cc +++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc @@ -21,6 +21,7 @@ #include "chrome/browser/webdata/web_data_service.h" #include "content/browser/intents/intent_injector.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/intents_messages.h" #include "content/public/browser/notification_source.h" #include "ui/gfx/codec/png_codec.h" #include "webkit/glue/web_intent_service_data.h" diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc index 9082dfd..73d32bc 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc @@ -11,8 +11,8 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h" #include "chrome/common/render_messages.h" -#include "content/common/view_messages.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/common/frame_navigate_params.h" namespace { @@ -34,7 +34,7 @@ SearchEngineTabHelper::~SearchEngineTabHelper() { void SearchEngineTabHelper::DidNavigateMainFrame( const content::LoadCommittedDetails& /*details*/, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { GenerateKeywordIfNecessary(params); } @@ -127,7 +127,7 @@ void SearchEngineTabHelper::OnPageHasOSDD( } void SearchEngineTabHelper::GenerateKeywordIfNecessary( - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { if (!params.searchable_form_url.is_valid()) return; diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.h b/chrome/browser/ui/search_engines/search_engine_tab_helper.h index 4a955ec..a2ffb49 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.h +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.h @@ -26,7 +26,7 @@ class SearchEngineTabHelper : public TabContentsObserver { // TabContentsObserver overrides. virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: @@ -37,7 +37,7 @@ class SearchEngineTabHelper : public TabContentsObserver { // If params has a searchable form, this tries to create a new keyword. void GenerateKeywordIfNecessary( - const ViewHostMsg_FrameNavigate_Params& params); + const content::FrameNavigateParams& params); // Delegate for notifying our owner about stuff. Not owned by us. SearchEngineTabHelperDelegate* delegate_; diff --git a/chrome/tools/ipclist/ipcfuzz.cc b/chrome/tools/ipclist/ipcfuzz.cc index b19350a..133dd1c 100644 --- a/chrome/tools/ipclist/ipcfuzz.cc +++ b/chrome/tools/ipclist/ipcfuzz.cc @@ -510,8 +510,11 @@ class PickleCracker : public Pickle { // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent)\ + IPC_STRUCT_BEGIN(struct_name) #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) #define IPC_STRUCT_MEMBER(type, name) IPC_STRUCT_TRAITS_MEMBER(name) #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() diff --git a/content/browser/intents/intent_injector.cc b/content/browser/intents/intent_injector.cc index e2472c6..1fc3bf3 100644 --- a/content/browser/intents/intent_injector.cc +++ b/content/browser/intents/intent_injector.cc @@ -9,8 +9,8 @@ #include "base/string16.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/intents_messages.h" #include "content/public/common/content_switches.h" -#include "ipc/ipc_message_macros.h" #include "webkit/glue/web_intent_data.h" #include "webkit/glue/web_intent_reply_data.h" @@ -54,7 +54,7 @@ void IntentInjector::RenderViewCreated(RenderViewHost* host) { void IntentInjector::DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { SendIntent(); } diff --git a/content/browser/intents/intent_injector.h b/content/browser/intents/intent_injector.h index ad4298b..5f2375c 100644 --- a/content/browser/intents/intent_injector.h +++ b/content/browser/intents/intent_injector.h @@ -10,19 +10,12 @@ #include "base/string16.h" #include "content/browser/tab_contents/tab_contents_observer.h" #include "content/common/content_export.h" -#include "content/common/intents_messages.h" - -class RenderViewHost; -class TabContents; +#include "webkit/glue/web_intent_reply_data.h" namespace webkit_glue { struct WebIntentData; } -namespace IPC { -class Message; -} - // Injects an intent into the renderer of a TabContents. The intent dispatch // logic will create one of these to take care of passing intent data down into // the context of the service, which will be running in the TabContents on which @@ -38,7 +31,7 @@ class CONTENT_EXPORT IntentInjector : public TabContentsObserver { virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; + const content::FrameNavigateParams& params) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE; diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc index f8c608b..d8eb7e6 100644 --- a/content/browser/renderer_host/render_view_host_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_browsertest.cc @@ -169,7 +169,7 @@ class RenderViewHostTestTabContentsObserver : public TabContentsObserver { virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE { + const content::FrameNavigateParams& params) OVERRIDE { observed_socket_address_ = params.socket_address; ++navigation_count_; } diff --git a/content/browser/tab_contents/tab_contents_observer.cc b/content/browser/tab_contents/tab_contents_observer.cc index aec33b5..e79a13f 100644 --- a/content/browser/tab_contents/tab_contents_observer.cc +++ b/content/browser/tab_contents/tab_contents_observer.cc @@ -27,12 +27,12 @@ void TabContentsObserver::NavigateToPendingEntry( void TabContentsObserver::DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { } void TabContentsObserver::DidNavigateAnyFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params) { + const content::FrameNavigateParams& params) { } void TabContentsObserver::DidStartProvisionalLoadForFrame( diff --git a/content/browser/tab_contents/tab_contents_observer.h b/content/browser/tab_contents/tab_contents_observer.h index 9e12f70..03590fe 100644 --- a/content/browser/tab_contents/tab_contents_observer.h +++ b/content/browser/tab_contents/tab_contents_observer.h @@ -13,7 +13,10 @@ #include "webkit/glue/window_open_disposition.h" class RenderViewHost; -struct ViewHostMsg_FrameNavigate_Params; + +namespace content { +struct FrameNavigateParams; +} // An observer API implemented by classes which are interested in various page // load events from TabContents. They also get a chance to filter IPC messages. @@ -29,10 +32,10 @@ class CONTENT_EXPORT TabContentsObserver : public IPC::Channel::Listener, NavigationController::ReloadType reload_type); virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params); + const content::FrameNavigateParams& params); virtual void DidNavigateAnyFrame( const content::LoadCommittedDetails& details, - const ViewHostMsg_FrameNavigate_Params& params); + const content::FrameNavigateParams& params); // |render_view_host| is the RenderViewHost for which the provisional load is // happening. virtual void DidStartProvisionalLoadForFrame( diff --git a/content/common/view_messages.h b/content/common/view_messages.h index a9c0f60..a720212 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -13,6 +13,7 @@ #include "content/common/navigation_gesture.h" #include "content/common/view_message_enums.h" #include "content/public/common/common_param_traits.h" +#include "content/public/common/frame_navigate_params.h" #include "content/public/common/page_zoom.h" #include "content/public/common/renderer_preferences.h" #include "content/public/common/webkit_param_traits.h" @@ -21,7 +22,6 @@ #include "ipc/ipc_message_macros.h" #include "ipc/ipc_platform_file.h" #include "media/base/media_log_event.h" -#include "net/base/host_port_pair.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" @@ -33,7 +33,6 @@ #include "ui/base/range/range.h" #include "ui/gfx/rect.h" #include "webkit/glue/context_menu.h" -#include "webkit/glue/password_form.h" #include "webkit/glue/webcookie.h" #include "webkit/glue/webmenuitem.h" #include "webkit/glue/webpreferences.h" @@ -116,24 +115,6 @@ IPC_STRUCT_TRAITS_BEGIN(FontDescriptor) IPC_STRUCT_TRAITS_END() #endif -IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences) - IPC_STRUCT_TRAITS_MEMBER(can_accept_load_drops) - IPC_STRUCT_TRAITS_MEMBER(should_antialias_text) - IPC_STRUCT_TRAITS_MEMBER(hinting) - IPC_STRUCT_TRAITS_MEMBER(subpixel_rendering) - IPC_STRUCT_TRAITS_MEMBER(focus_ring_color) - IPC_STRUCT_TRAITS_MEMBER(thumb_active_color) - IPC_STRUCT_TRAITS_MEMBER(thumb_inactive_color) - IPC_STRUCT_TRAITS_MEMBER(track_color) - IPC_STRUCT_TRAITS_MEMBER(active_selection_bg_color) - IPC_STRUCT_TRAITS_MEMBER(active_selection_fg_color) - IPC_STRUCT_TRAITS_MEMBER(inactive_selection_bg_color) - IPC_STRUCT_TRAITS_MEMBER(inactive_selection_fg_color) - IPC_STRUCT_TRAITS_MEMBER(browser_handles_top_level_requests) - IPC_STRUCT_TRAITS_MEMBER(caret_blink_interval) - IPC_STRUCT_TRAITS_MEMBER(enable_referrers) -IPC_STRUCT_TRAITS_END() - IPC_STRUCT_TRAITS_BEGIN(ViewMsg_StopFinding_Params) IPC_STRUCT_TRAITS_MEMBER(action) IPC_STRUCT_TRAITS_END() @@ -259,6 +240,38 @@ IPC_STRUCT_TRAITS_BEGIN(WebMenuItem) IPC_STRUCT_TRAITS_MEMBER(submenu) IPC_STRUCT_TRAITS_END() +IPC_STRUCT_TRAITS_BEGIN(content::FrameNavigateParams) + IPC_STRUCT_TRAITS_MEMBER(page_id) + IPC_STRUCT_TRAITS_MEMBER(url) + IPC_STRUCT_TRAITS_MEMBER(referrer) + IPC_STRUCT_TRAITS_MEMBER(transition) + IPC_STRUCT_TRAITS_MEMBER(redirects) + IPC_STRUCT_TRAITS_MEMBER(should_update_history) + IPC_STRUCT_TRAITS_MEMBER(searchable_form_url) + IPC_STRUCT_TRAITS_MEMBER(searchable_form_encoding) + IPC_STRUCT_TRAITS_MEMBER(password_form) + IPC_STRUCT_TRAITS_MEMBER(contents_mime_type) + IPC_STRUCT_TRAITS_MEMBER(socket_address) +IPC_STRUCT_TRAITS_END() + +IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences) + IPC_STRUCT_TRAITS_MEMBER(can_accept_load_drops) + IPC_STRUCT_TRAITS_MEMBER(should_antialias_text) + IPC_STRUCT_TRAITS_MEMBER(hinting) + IPC_STRUCT_TRAITS_MEMBER(subpixel_rendering) + IPC_STRUCT_TRAITS_MEMBER(focus_ring_color) + IPC_STRUCT_TRAITS_MEMBER(thumb_active_color) + IPC_STRUCT_TRAITS_MEMBER(thumb_inactive_color) + IPC_STRUCT_TRAITS_MEMBER(track_color) + IPC_STRUCT_TRAITS_MEMBER(active_selection_bg_color) + IPC_STRUCT_TRAITS_MEMBER(active_selection_fg_color) + IPC_STRUCT_TRAITS_MEMBER(inactive_selection_bg_color) + IPC_STRUCT_TRAITS_MEMBER(inactive_selection_fg_color) + IPC_STRUCT_TRAITS_MEMBER(browser_handles_top_level_requests) + IPC_STRUCT_TRAITS_MEMBER(caret_blink_interval) + IPC_STRUCT_TRAITS_MEMBER(enable_referrers) +IPC_STRUCT_TRAITS_END() + IPC_STRUCT_TRAITS_BEGIN(webkit_glue::CustomContextMenuContext) IPC_STRUCT_TRAITS_MEMBER(is_pepper_menu) IPC_STRUCT_TRAITS_MEMBER(request_id) @@ -342,7 +355,6 @@ IPC_STRUCT_BEGIN(ViewHostMsg_CreateWindow_Params) IPC_STRUCT_MEMBER(GURL, target_url) IPC_STRUCT_END() - IPC_STRUCT_BEGIN(ViewHostMsg_CreateWorker_Params) // URL for the worker script. IPC_STRUCT_MEMBER(GURL, url) @@ -365,46 +377,30 @@ IPC_STRUCT_BEGIN(ViewHostMsg_CreateWorker_Params) IPC_STRUCT_MEMBER(int64, script_resource_appcache_id) IPC_STRUCT_END() +IPC_STRUCT_BEGIN(ViewHostMsg_AccessibilityNotification_Params) + // Type of notification. + IPC_STRUCT_MEMBER(ViewHostMsg_AccEvent::Value, notification_type) + + // ID of the node that the notification applies to. + IPC_STRUCT_MEMBER(int, id) + + // The accessibility node tree. + IPC_STRUCT_MEMBER(webkit_glue::WebAccessibility, acc_tree) + + // Whether children are included in this tree, otherwise it's just an + // update to this one node and existing children are left in place. + IPC_STRUCT_MEMBER(bool, includes_children) +IPC_STRUCT_END() + // Parameters structure for ViewHostMsg_FrameNavigate, which has too many data // parameters to be reasonably put in a predefined IPC message. -IPC_STRUCT_BEGIN(ViewHostMsg_FrameNavigate_Params) - // Page ID of this navigation. The renderer creates a new unique page ID - // anytime a new session history entry is created. This means you'll get new - // page IDs for user actions, and the old page IDs will be reloaded when - // iframes are loaded automatically. - IPC_STRUCT_MEMBER(int32, page_id) - +IPC_STRUCT_BEGIN_WITH_PARENT(ViewHostMsg_FrameNavigate_Params, + content::FrameNavigateParams) + IPC_STRUCT_TRAITS_PARENT(content::FrameNavigateParams) // The frame ID for this navigation. The frame ID uniquely identifies the // frame the navigation happened in for a given renderer. IPC_STRUCT_MEMBER(int64, frame_id) - // URL of the page being loaded. - IPC_STRUCT_MEMBER(GURL, url) - - // URL of the referrer of this load. WebKit generates this based on the - // source of the event that caused the load. - IPC_STRUCT_MEMBER(GURL, referrer) - - // The type of transition. - IPC_STRUCT_MEMBER(content::PageTransition, transition) - - // Lists the redirects that occurred on the way to the current page. This - // vector has the same format as reported by the WebDataSource in the glue, - // with the current page being the last one in the list (so even when - // there's no redirect, there will be one entry in the list. - IPC_STRUCT_MEMBER(std::vector<GURL>, redirects) - - // Set to false if we want to update the session history but not update - // the browser history. E.g., on unreachable urls. - IPC_STRUCT_MEMBER(bool, should_update_history) - - // See SearchableFormData for a description of these. - IPC_STRUCT_MEMBER(GURL, searchable_form_url) - IPC_STRUCT_MEMBER(std::string, searchable_form_encoding) - - // See password_form.h. - IPC_STRUCT_MEMBER(webkit_glue::PasswordForm, password_form) - // Information regarding the security of the connection (empty if the // connection was not secure). IPC_STRUCT_MEMBER(std::string, security_info) @@ -412,9 +408,6 @@ IPC_STRUCT_BEGIN(ViewHostMsg_FrameNavigate_Params) // The gesture that initiated this navigation. IPC_STRUCT_MEMBER(NavigationGesture, gesture) - // Contents MIME type of main frame. - IPC_STRUCT_MEMBER(std::string, contents_mime_type) - // True if this was a post request. IPC_STRUCT_MEMBER(bool, is_post) @@ -426,9 +419,6 @@ IPC_STRUCT_BEGIN(ViewHostMsg_FrameNavigate_Params) // The status code of the HTTP request. IPC_STRUCT_MEMBER(int, http_status_code) - // Remote address of the socket which fetched this resource. - IPC_STRUCT_MEMBER(net::HostPortPair, socket_address) - // True if the connection was proxied. In this case, socket_address // will represent the address of the proxy, rather than the remote host. IPC_STRUCT_MEMBER(bool, was_fetched_via_proxy) @@ -437,22 +427,6 @@ IPC_STRUCT_BEGIN(ViewHostMsg_FrameNavigate_Params) IPC_STRUCT_MEMBER(std::string, content_state) IPC_STRUCT_END() -IPC_STRUCT_BEGIN(ViewHostMsg_AccessibilityNotification_Params) - // Type of notification. - IPC_STRUCT_MEMBER(ViewHostMsg_AccEvent::Value, notification_type) - - // ID of the node that the notification applies to. - IPC_STRUCT_MEMBER(int, id) - - // The accessibility node tree. - IPC_STRUCT_MEMBER(webkit_glue::WebAccessibility, acc_tree) - - // Whether children are included in this tree, otherwise it's just an - // update to this one node and existing children are left in place. - IPC_STRUCT_MEMBER(bool, includes_children) -IPC_STRUCT_END() - - IPC_STRUCT_BEGIN(ViewHostMsg_RunFileChooser_Params) IPC_STRUCT_MEMBER(ViewHostMsg_RunFileChooser_Mode::Value, mode) diff --git a/content/content_common.gypi b/content/content_common.gypi index 469fa3e..61e1d9e 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -38,6 +38,8 @@ 'public/common/content_switches.h', 'public/common/dx_diag_node.cc', 'public/common/dx_diag_node.h', + 'public/common/frame_navigate_params.cc', + 'public/common/frame_navigate_params.h', 'public/common/gpu_info.cc', 'public/common/gpu_info.h', 'public/common/main_function_params.h', diff --git a/content/public/common/frame_navigate_params.cc b/content/public/common/frame_navigate_params.cc new file mode 100644 index 0000000..c031cc8 --- /dev/null +++ b/content/public/common/frame_navigate_params.cc @@ -0,0 +1,17 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/public/common/frame_navigate_params.h" + +namespace content { + +FrameNavigateParams::FrameNavigateParams() + : page_id(0), + should_update_history(false) { +} + +FrameNavigateParams::~FrameNavigateParams() { +} + +} // namespace content diff --git a/content/public/common/frame_navigate_params.h b/content/public/common/frame_navigate_params.h new file mode 100644 index 0000000..a776bf0 --- /dev/null +++ b/content/public/common/frame_navigate_params.h @@ -0,0 +1,67 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_PUBLIC_COMMON_FRAME_NAVIGATE_PARAMS_H_ +#define CONTENT_PUBLIC_COMMON_FRAME_NAVIGATE_PARAMS_H_ +#pragma once + +#include <string> +#include <vector> + +#include "content/common/content_export.h" +#include "content/public/common/page_transition_types.h" +#include "googleurl/src/gurl.h" +#include "net/base/host_port_pair.h" +#include "webkit/glue/password_form.h" + +namespace content { + +// Struct used by TabContentsObserver. +struct CONTENT_EXPORT FrameNavigateParams { + FrameNavigateParams(); + ~FrameNavigateParams(); + + // Page ID of this navigation. The renderer creates a new unique page ID + // anytime a new session history entry is created. This means you'll get new + // page IDs for user actions, and the old page IDs will be reloaded when + // iframes are loaded automatically. + int32 page_id; + + // URL of the page being loaded. + GURL url; + + // URL of the referrer of this load. WebKit generates this based on the + // source of the event that caused the load. + GURL referrer; + + // The type of transition. + PageTransition transition; + + // Lists the redirects that occurred on the way to the current page. This + // vector has the same format as reported by the WebDataSource in the glue, + // with the current page being the last one in the list (so even when + // there's no redirect, there will be one entry in the list. + std::vector<GURL> redirects; + + // Set to false if we want to update the session history but not update + // the browser history. E.g., on unreachable urls. + bool should_update_history; + + // See SearchableFormData for a description of these. + GURL searchable_form_url; + std::string searchable_form_encoding; + + // See password_form.h. + webkit_glue::PasswordForm password_form; + + // Contents MIME type of main frame. + std::string contents_mime_type; + + // Remote address of the socket which fetched this resource. + net::HostPortPair socket_address; +}; + +} // namespace content + +#endif // CONTENT_PUBLIC_COMMON_FRAME_NAVIGATE_PARAMS_H_ diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h index 27fcf83..783108e 100644 --- a/ipc/ipc_message_macros.h +++ b/ipc/ipc_message_macros.h @@ -191,10 +191,12 @@ // Macros for defining structs. May be subsequently redefined. #define IPC_STRUCT_BEGIN(struct_name) \ + IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, IPC::NoParams) +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ struct struct_name; \ IPC_STRUCT_TRAITS_BEGIN(struct_name) \ IPC_STRUCT_TRAITS_END() \ - struct IPC_MESSAGE_EXPORT struct_name : IPC::NoParams { \ + struct IPC_MESSAGE_EXPORT struct_name : parent { \ struct_name(); \ ~struct_name(); #define IPC_STRUCT_MEMBER(type, name) type name; diff --git a/ipc/ipc_message_null_macros.h b/ipc/ipc_message_null_macros.h index 7cd02f5..12d9e6e 100644 --- a/ipc/ipc_message_null_macros.h +++ b/ipc/ipc_message_null_macros.h @@ -7,6 +7,7 @@ // NULL out all the macros that need NULLing, so that multiple includes of // the XXXX_messages_internal.h files will not generate noise. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END #undef IPC_STRUCT_TRAITS_BEGIN @@ -17,6 +18,7 @@ #undef IPC_MESSAGE_DECL #define IPC_STRUCT_BEGIN(struct_name) +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) #define IPC_STRUCT_MEMBER(type, name) #define IPC_STRUCT_END() #define IPC_STRUCT_TRAITS_BEGIN(struct_name) diff --git a/ipc/param_traits_log_macros.h b/ipc/param_traits_log_macros.h index 8259a0d..b2d1f2e 100644 --- a/ipc/param_traits_log_macros.h +++ b/ipc/param_traits_log_macros.h @@ -13,8 +13,11 @@ // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ + IPC_STRUCT_BEGIN(struct_name) #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) #define IPC_STRUCT_MEMBER(type, name) IPC_STRUCT_TRAITS_MEMBER(name) #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() diff --git a/ipc/param_traits_read_macros.h b/ipc/param_traits_read_macros.h index f0b88bc..a78c880 100644 --- a/ipc/param_traits_read_macros.h +++ b/ipc/param_traits_read_macros.h @@ -11,8 +11,11 @@ // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ + IPC_STRUCT_BEGIN(struct_name) #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) #define IPC_STRUCT_MEMBER(type, name) IPC_STRUCT_TRAITS_MEMBER(name) #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() diff --git a/ipc/param_traits_write_macros.h b/ipc/param_traits_write_macros.h index 844c385..c83d6b0 100644 --- a/ipc/param_traits_write_macros.h +++ b/ipc/param_traits_write_macros.h @@ -11,8 +11,11 @@ // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ + IPC_STRUCT_BEGIN(struct_name) #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) #define IPC_STRUCT_MEMBER(type, name) IPC_STRUCT_TRAITS_MEMBER(name) #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() diff --git a/ipc/struct_constructor_macros.h b/ipc/struct_constructor_macros.h index 67bfcfb..ee056a3 100644 --- a/ipc/struct_constructor_macros.h +++ b/ipc/struct_constructor_macros.h @@ -10,9 +10,12 @@ // Set up so next include will generate constructors. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END #define IPC_STRUCT_BEGIN(struct_name) struct_name::struct_name() : NoParams() +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ + struct_name::struct_name() : parent() #define IPC_STRUCT_MEMBER(type, name) , name() #define IPC_STRUCT_END() {} diff --git a/ipc/struct_destructor_macros.h b/ipc/struct_destructor_macros.h index bf3dc95..13fce2d 100644 --- a/ipc/struct_destructor_macros.h +++ b/ipc/struct_destructor_macros.h @@ -10,6 +10,9 @@ // Set up so next include will generate destructors. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ + IPC_STRUCT_BEGIN(struct_name) #define IPC_STRUCT_BEGIN(struct_name) struct_name::~struct_name() {} #endif // IPC_STRUCT_DESTRUCTOR_MACROS_H_ |