diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 07:02:04 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 07:02:04 +0000 |
commit | ad23a09a27c2863e56810a849beca09cb5e2b6d8 (patch) | |
tree | c9527aeb0e9c0190f621011624ed0f4e7eecf035 /chrome/browser/extensions | |
parent | e18637fbd2e55fb610d92bc061f10a0629826377 (diff) | |
download | chromium_src-ad23a09a27c2863e56810a849beca09cb5e2b6d8.zip chromium_src-ad23a09a27c2863e56810a849beca09cb5e2b6d8.tar.gz chromium_src-ad23a09a27c2863e56810a849beca09cb5e2b6d8.tar.bz2 |
Convert a few methods in NavigationController to return a content::NavigationEntry, in preparation for creating an interface around NavigationController.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9008034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
9 files changed, 17 insertions, 14 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index ccf3d9b..dca3970 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -18,8 +18,8 @@ #include "chrome/common/string_ordinal.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/test/test_navigation_observer.h" #include "net/base/mock_host_resolver.h" diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index e5d8c72..21ed98f 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -26,8 +26,8 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" -#include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "net/base/net_util.h" #include "net/test/test_server.h" diff --git a/chrome/browser/extensions/extension_navigation_observer.cc b/chrome/browser/extensions/extension_navigation_observer.cc index ef7640e..f1aabb1 100644 --- a/chrome/browser/extensions/extension_navigation_observer.cc +++ b/chrome/browser/extensions/extension_navigation_observer.cc @@ -7,7 +7,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "content/browser/tab_contents/navigation_controller.h" -#include "content/browser/tab_contents/navigation_entry.h" +#include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" ExtensionNavigationObserver::ExtensionNavigationObserver(Profile* profile) @@ -46,7 +46,7 @@ void ExtensionNavigationObserver::PromptToEnableExtensionIfNecessary( if (!in_progress_prompt_extension_id_.empty()) return; - NavigationEntry* nav_entry = nav_controller->GetActiveEntry(); + content::NavigationEntry* nav_entry = nav_controller->GetActiveEntry(); if (!nav_entry) return; diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc index 63231bc..a55d57f 100644 --- a/chrome/browser/extensions/extension_override_apitest.cc +++ b/chrome/browser/extensions/extension_override_apitest.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/navigation_entry.h" class ExtensionOverrideTest : public ExtensionApiTest { protected: diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc index c42af81..713fc81 100644 --- a/chrome/browser/extensions/extension_page_actions_module.cc +++ b/chrome/browser/extensions/extension_page_actions_module.cc @@ -18,8 +18,8 @@ #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/render_messages.h" -#include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/navigation_entry.h" namespace keys = extension_page_actions_module_constants; @@ -80,7 +80,7 @@ bool PageActionFunction::SetPageActionEnabled(bool enable) { } // Make sure the URL hasn't changed. - NavigationEntry* entry = + content::NavigationEntry* entry = contents->tab_contents()->GetController().GetActiveEntry(); if (!entry || url != entry->GetURL().spec()) { error_ = ExtensionErrorUtils::FormatErrorMessage(kUrlNotActiveError, url); diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index ceea844..55cc01a 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -12,7 +12,8 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/sessions/restore_tab_helper.h" #include "chrome/browser/extensions/extension_tabs_module_constants.h" -#include "content/browser/tab_contents/navigation_entry.h" +#include "content/public/browser/favicon_status.h" +#include "content/public/browser/navigation_entry.h" namespace keys = extension_tabs_module_constants; namespace errors = extension_manifest_errors; @@ -118,7 +119,8 @@ DictionaryValue* ExtensionTabUtil::CreateTabValue(const WebContents* contents, contents->GetBrowserContext()->IsOffTheRecord()); if (!is_loading) { - NavigationEntry* entry = contents->GetController().GetActiveEntry(); + content::NavigationEntry* entry = + contents->GetController().GetActiveEntry(); if (entry) { if (entry->GetFavicon().valid) result->SetString(keys::kFaviconUrlKey, entry->GetFavicon().url.spec()); diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index f31e98a..d07df26 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -46,9 +46,9 @@ #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" -#include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "skia/ext/image_operations.h" @@ -1377,7 +1377,8 @@ bool ReloadTabFunction::RunImpl() { TabContents* tab_contents = contents->tab_contents(); if (tab_contents->ShowingInterstitialPage()) { // This does as same as Browser::ReloadInternal. - NavigationEntry* entry = tab_contents->GetController().GetActiveEntry(); + content::NavigationEntry* entry = + tab_contents->GetController().GetActiveEntry(); OpenURLParams params(entry->GetURL(), Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_RELOAD, false); GetCurrentBrowser()->OpenURL(params); diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc index 7835371..ffdcab3 100644 --- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc +++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc @@ -15,8 +15,8 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/tab_contents/navigation_controller.h" -#include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/navigation_entry.h" #include "googleurl/src/gurl.h" class ExtensionURLRewriteBrowserTest : public ExtensionBrowserTest { @@ -34,7 +34,7 @@ class ExtensionURLRewriteBrowserTest : public ExtensionBrowserTest { return &browser()->GetSelectedTabContents()->GetController(); } - NavigationEntry* GetNavigationEntry() const { + content::NavigationEntry* GetNavigationEntry() const { return GetNavigationController()->GetActiveEntry(); } diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index 02c4b79..cc8a6c5 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -23,10 +23,10 @@ #include "chrome/common/extensions/extension_constants.h" #include "content/browser/download/download_types.h" #include "content/browser/tab_contents/navigation_controller.h" -#include "content/browser/tab_contents/navigation_entry.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_file.h" #include "content/public/browser/download_manager.h" +#include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "googleurl/src/gurl.h" |