summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/login/enrollment/enterprise_enrollment_view.cc2
-rw-r--r--chrome/browser/chromeos/login/eula_view.cc2
-rw-r--r--chrome/browser/chromeos/login/eula_view.h2
-rw-r--r--chrome/browser/chromeos/login/web_page_screen.cc2
-rw-r--r--chrome/browser/chromeos/login/web_page_screen.h2
-rw-r--r--chrome/browser/external_tab_container_win.cc4
-rw-r--r--chrome/browser/external_tab_container_win.h4
-rw-r--r--chrome/browser/instant/instant_loader.cc8
-rw-r--r--chrome/browser/prerender/prerender_contents.cc2
-rw-r--r--chrome/browser/printing/print_preview_tab_controller.cc8
-rw-r--r--chrome/browser/printing/print_preview_tab_controller.h2
-rw-r--r--chrome/browser/printing/print_preview_tab_controller_unittest.cc2
-rw-r--r--chrome/browser/sessions/session_service.cc4
-rw-r--r--chrome/browser/tab_contents/language_state.cc2
-rw-r--r--chrome/browser/translate/translate_manager.cc2
-rw-r--r--chrome/browser/translate/translate_manager_browsertest.cc4
-rw-r--r--chrome/browser/ui/browser.cc2
-rw-r--r--chrome/browser/ui/browser.h2
-rw-r--r--chrome/browser/ui/webui/html_dialog_tab_contents_delegate.cc2
-rw-r--r--chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h2
-rw-r--r--chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc2
-rw-r--r--chrome/common/automation_messages_internal.h2
22 files changed, 33 insertions, 31 deletions
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_view.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_view.cc
index 1d22f17..48d77fe 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_view.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_view.cc
@@ -50,7 +50,7 @@ class EnrollmentDomView : public WebPageDomView,
virtual bool IsPopup(TabContents* source) { return false; }
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type) {
+ content::NavigationType navigation_type) {
return false;
}
virtual bool HandleContextMenu(const ContextMenuParams& params) {
diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc
index add12169..b80512c 100644
--- a/chrome/browser/chromeos/login/eula_view.cc
+++ b/chrome/browser/chromeos/login/eula_view.cc
@@ -207,7 +207,7 @@ bool EULATabContentsDelegate::IsPopup(TabContents* source) {
bool EULATabContentsDelegate::ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type) {
+ content::NavigationType navigation_type) {
return false;
}
diff --git a/chrome/browser/chromeos/login/eula_view.h b/chrome/browser/chromeos/login/eula_view.h
index 6d9d2c1..6339651 100644
--- a/chrome/browser/chromeos/login/eula_view.h
+++ b/chrome/browser/chromeos/login/eula_view.h
@@ -42,7 +42,7 @@ class EULATabContentsDelegate : public TabContentsDelegate {
virtual bool IsPopup(TabContents* source);
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type);
+ content::NavigationType navigation_type);
virtual bool HandleContextMenu(const ContextMenuParams& params);
private:
diff --git a/chrome/browser/chromeos/login/web_page_screen.cc b/chrome/browser/chromeos/login/web_page_screen.cc
index ae5d33f..fd35711 100644
--- a/chrome/browser/chromeos/login/web_page_screen.cc
+++ b/chrome/browser/chromeos/login/web_page_screen.cc
@@ -30,7 +30,7 @@ bool WebPageScreen::IsPopup(TabContents* source) {
bool WebPageScreen::ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type) {
+ content::NavigationType navigation_type) {
return false;
}
diff --git a/chrome/browser/chromeos/login/web_page_screen.h b/chrome/browser/chromeos/login/web_page_screen.h
index e1c581e..e314dae 100644
--- a/chrome/browser/chromeos/login/web_page_screen.h
+++ b/chrome/browser/chromeos/login/web_page_screen.h
@@ -28,7 +28,7 @@ class WebPageScreen : public TabContentsDelegate {
virtual bool IsPopup(TabContents* source);
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type);
+ content::NavigationType navigation_type);
virtual bool HandleContextMenu(const ContextMenuParams& params);
// Called by |timeout_timer_|. Stops page fetching and closes screen.
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
index 2def7ea..3f58d2a 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab_container_win.cc
@@ -425,7 +425,7 @@ void ExternalTabContainer::NavigationStateChanged(const TabContents* source,
unsigned changed_flags) {
if (automation_) {
NavigationInfo nav_info;
- if (InitNavigationInfo(&nav_info, NavigationType::NAV_IGNORE, 0))
+ if (InitNavigationInfo(&nav_info, content::NAVIGATION_TYPE_NAV_IGNORE, 0))
automation_->Send(new AutomationMsg_NavigationStateChanged(
tab_handle_, changed_flags, nav_info));
}
@@ -971,7 +971,7 @@ bool ExternalTabContainer::ProcessUnhandledKeyStroke(HWND window,
}
bool ExternalTabContainer::InitNavigationInfo(NavigationInfo* nav_info,
- NavigationType::Type nav_type,
+ content::NavigationType nav_type,
int relative_offset) {
DCHECK(nav_info);
NavigationEntry* entry = tab_contents_->controller().GetActiveEntry();
diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h
index de478ea..275c4eb 100644
--- a/chrome/browser/external_tab_container_win.h
+++ b/chrome/browser/external_tab_container_win.h
@@ -21,7 +21,7 @@
#include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
#include "content/browser/tab_contents/tab_contents_delegate.h"
#include "content/browser/tab_contents/tab_contents_observer.h"
-#include "content/common/navigation_types.h"
+#include "content/public/browser/navigation_types.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
#include "views/accelerator.h"
@@ -243,7 +243,7 @@ class ExternalTabContainer : public TabContentsDelegate,
virtual void OnFinalMessage(HWND window);
bool InitNavigationInfo(NavigationInfo* nav_info,
- NavigationType::Type nav_type,
+ content::NavigationType nav_type,
int relative_offset);
void Navigate(const GURL& url, const GURL& referrer);
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index 3a00147..af74814 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -221,7 +221,7 @@ class InstantLoader::TabContentsDelegateImpl
virtual bool OnGoToEntryOffset(int offset) OVERRIDE;
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type) OVERRIDE;
+ content::NavigationType navigation_type) OVERRIDE;
// TabContentsWrapperDelegate:
virtual void SwapTabContents(TabContentsWrapper* old_tc,
@@ -490,9 +490,11 @@ bool InstantLoader::TabContentsDelegateImpl::OnGoToEntryOffset(int offset) {
bool InstantLoader::TabContentsDelegateImpl::ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type) {
- if (waiting_for_new_page_ && navigation_type == NavigationType::NEW_PAGE)
+ content::NavigationType navigation_type) {
+ if (waiting_for_new_page_ &&
+ navigation_type == content::NAVIGATION_TYPE_NEW_PAGE) {
waiting_for_new_page_ = false;
+ }
if (!waiting_for_new_page_) {
add_page_vector_.push_back(
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index df56653..0ab7285 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -91,7 +91,7 @@ class PrerenderContents::TabContentsDelegateImpl
// TabContentsDelegate implementation:
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type) OVERRIDE {
+ content::NavigationType navigation_type) OVERRIDE {
add_page_vector_.push_back(
scoped_refptr<history::HistoryAddPageArgs>(add_page_args.Clone()));
return false;
diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc
index 42976f7..330eca5 100644
--- a/chrome/browser/printing/print_preview_tab_controller.cc
+++ b/chrome/browser/printing/print_preview_tab_controller.cc
@@ -197,11 +197,11 @@ void PrintPreviewTabController::OnNavEntryCommitted(
bool source_tab_is_preview_tab = (tab == preview_tab);
if (details) {
content::PageTransition transition_type = details->entry->transition_type();
- NavigationType::Type nav_type = details->type;
+ content::NavigationType nav_type = details->type;
// Don't update/erase the map entry if the page has not changed.
if (transition_type == content::PAGE_TRANSITION_RELOAD ||
- nav_type == NavigationType::SAME_PAGE) {
+ nav_type == content::NAVIGATION_TYPE_SAME_PAGE) {
if (source_tab_is_preview_tab)
SetInitiatorTabURLAndTitle(preview_tab);
return;
@@ -210,7 +210,7 @@ void PrintPreviewTabController::OnNavEntryCommitted(
// New |preview_tab| is created. Don't update/erase map entry.
if (waiting_for_new_preview_page_ &&
transition_type == content::PAGE_TRANSITION_LINK &&
- nav_type == NavigationType::NEW_PAGE &&
+ nav_type == content::NAVIGATION_TYPE_NEW_PAGE &&
source_tab_is_preview_tab) {
waiting_for_new_preview_page_ = false;
SetInitiatorTabURLAndTitle(preview_tab);
@@ -220,7 +220,7 @@ void PrintPreviewTabController::OnNavEntryCommitted(
// User navigated to a preview tab using forward/back button.
if (source_tab_is_preview_tab &&
transition_type == content::PAGE_TRANSITION_FORWARD_BACK &&
- nav_type == NavigationType::EXISTING_PAGE) {
+ nav_type == content::NAVIGATION_TYPE_EXISTING_PAGE) {
return;
}
}
diff --git a/chrome/browser/printing/print_preview_tab_controller.h b/chrome/browser/printing/print_preview_tab_controller.h
index b954bfe..afd8b93 100644
--- a/chrome/browser/printing/print_preview_tab_controller.h
+++ b/chrome/browser/printing/print_preview_tab_controller.h
@@ -111,7 +111,7 @@ class PrintPreviewTabController
NotificationRegistrar registrar_;
// True if the controller is waiting for a new preview tab via
- // NavigationType::NEW_PAGE.
+ // content::NAVIGATION_TYPE_NEW_PAGE.
bool waiting_for_new_preview_page_;
DISALLOW_COPY_AND_ASSIGN(PrintPreviewTabController);
diff --git a/chrome/browser/printing/print_preview_tab_controller_unittest.cc b/chrome/browser/printing/print_preview_tab_controller_unittest.cc
index 2305a16..8b418d4 100644
--- a/chrome/browser/printing/print_preview_tab_controller_unittest.cc
+++ b/chrome/browser/printing/print_preview_tab_controller_unittest.cc
@@ -97,7 +97,7 @@ TEST_F(PrintPreviewTabControllerUnitTest, TitleAfterReload) {
entry.reset(new NavigationEntry());
entry->set_transition_type(content::PAGE_TRANSITION_RELOAD);
content::LoadCommittedDetails details;
- details.type = NavigationType::SAME_PAGE;
+ details.type = content::NAVIGATION_TYPE_SAME_PAGE;
details.entry = entry.get();
NotificationService::current()->Notify(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index d5cbfe9..94b7050 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -621,8 +621,8 @@ void SessionService::Observe(int type,
current_entry_index,
*tab->controller().GetEntryAtIndex(current_entry_index));
Details<content::LoadCommittedDetails> changed(details);
- if (changed->type == NavigationType::NEW_PAGE ||
- changed->type == NavigationType::EXISTING_PAGE) {
+ if (changed->type == content::NAVIGATION_TYPE_NEW_PAGE ||
+ changed->type == content::NAVIGATION_TYPE_EXISTING_PAGE) {
RecordSessionUpdateHistogramData(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
&last_updated_nav_entry_commit_time_);
diff --git a/chrome/browser/tab_contents/language_state.cc b/chrome/browser/tab_contents/language_state.cc
index 06ef773..dec04b7 100644
--- a/chrome/browser/tab_contents/language_state.cc
+++ b/chrome/browser/tab_contents/language_state.cc
@@ -26,7 +26,7 @@ void LanguageState::DidNavigate(
bool reload =
details.entry->transition_type() == content::PAGE_TRANSITION_RELOAD ||
- details.type == NavigationType::SAME_PAGE;
+ details.type == content::NAVIGATION_TYPE_SAME_PAGE;
if (reload) {
// We might not get a LanguageDetermined notifications on reloads. Make sure
// to keep the original language and to set current_lang_ so
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index 0e76619c..6f5d663 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -281,7 +281,7 @@ void TranslateManager::Observe(int type,
return;
}
if (entry->transition_type() != content::PAGE_TRANSITION_RELOAD &&
- load_details->type != NavigationType::SAME_PAGE) {
+ load_details->type != content::NAVIGATION_TYPE_SAME_PAGE) {
return;
}
// When doing a page reload, we don't get a TAB_LANGUAGE_DETERMINED
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index c927578..c3acd10e 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -666,7 +666,7 @@ TEST_F(TranslateManagerTest, Reload) {
const content::LoadCommittedDetails& nav_details =
nav_observer.get_load_commited_details();
EXPECT_TRUE(nav_details.entry != NULL); // There was a navigation.
- EXPECT_EQ(NavigationType::EXISTING_PAGE, nav_details.type);
+ EXPECT_EQ(content::NAVIGATION_TYPE_EXISTING_PAGE, nav_details.type);
// The TranslateManager class processes the navigation entry committed
// notification in a posted task; process that task.
@@ -697,7 +697,7 @@ TEST_F(TranslateManagerTest, ReloadFromLocationBar) {
const content::LoadCommittedDetails& nav_details =
nav_observer.get_load_commited_details();
EXPECT_TRUE(nav_details.entry != NULL); // There was a navigation.
- EXPECT_EQ(NavigationType::SAME_PAGE, nav_details.type);
+ EXPECT_EQ(content::NAVIGATION_TYPE_SAME_PAGE, nav_details.type);
// The TranslateManager class processes the navigation entry committed
// notification in a posted task; process that task.
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 78fd45d..3557df7 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -3776,7 +3776,7 @@ void Browser::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) {
bool Browser::ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type) {
+ content::NavigationType navigation_type) {
// Don't update history if running as app.
return !IsApplication();
}
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index cb5b348..a0fdacc 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -958,7 +958,7 @@ class Browser : public TabHandlerDelegate,
virtual void ShowRepostFormWarningDialog(TabContents* tab_contents) OVERRIDE;
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type) OVERRIDE;
+ content::NavigationType navigation_type) OVERRIDE;
virtual void ContentRestrictionsChanged(TabContents* source) OVERRIDE;
virtual void RendererUnresponsive(TabContents* source) OVERRIDE;
virtual void RendererResponsive(TabContents* source) OVERRIDE;
diff --git a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.cc b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.cc
index 2f37f1a..c502015 100644
--- a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.cc
+++ b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.cc
@@ -91,6 +91,6 @@ bool HtmlDialogTabContentsDelegate::IsPopup(const TabContents* source) const {
bool HtmlDialogTabContentsDelegate::ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type) {
+ content::NavigationType navigation_type) {
return false;
}
diff --git a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h
index 2ff03f0..8353bc6 100644
--- a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h
+++ b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h
@@ -53,7 +53,7 @@ class HtmlDialogTabContentsDelegate : public TabContentsDelegate {
virtual bool IsPopup(const TabContents* source) const;
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
- NavigationType::Type navigation_type);
+ content::NavigationType navigation_type);
private:
Profile* profile_; // Weak pointer. Always an original profile.
diff --git a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc
index 6789add..93353a4 100644
--- a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc
+++ b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc
@@ -59,7 +59,7 @@ TEST_F(HtmlDialogTabContentsDelegateTest, DoNothingMethodsTest) {
GURL(), base::Time::Now(), 0, 0, GURL(), history::RedirectList(),
content::PAGE_TRANSITION_TYPED, history::SOURCE_SYNCED, false));
EXPECT_FALSE(test_tab_contents_delegate_->ShouldAddNavigationToHistory(
- *should_add_args, NavigationType::NEW_PAGE));
+ *should_add_args, content::NAVIGATION_TYPE_NEW_PAGE));
test_tab_contents_delegate_->NavigationStateChanged(NULL, 0);
test_tab_contents_delegate_->ActivateContents(NULL);
test_tab_contents_delegate_->LoadingStateChanged(NULL);
diff --git a/chrome/common/automation_messages_internal.h b/chrome/common/automation_messages_internal.h
index ac032dbb..1532006 100644
--- a/chrome/common/automation_messages_internal.h
+++ b/chrome/common/automation_messages_internal.h
@@ -9,7 +9,6 @@
#include "base/string16.h"
#include "chrome/common/content_settings.h"
-#include "content/common/navigation_types.h"
#include "googleurl/src/gurl.h"
#include "ipc/ipc_message_macros.h"
#include "net/base/cert_status_flags.h"
@@ -31,6 +30,7 @@
// __COUNTER__, in which case we can get rid of the __LINE__.
+
#define IPC_MESSAGE_START AutomationMsgStart
// This message is fired when the AutomationProvider is up and running
generated by cgit v1.1 at 2025-02-11 09:00:20 +0000