diff options
503 files changed, 1990 insertions, 1949 deletions
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc index 62a4d07..56d06e1 100644 --- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc +++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc @@ -406,13 +406,13 @@ void AwResourceDispatcherHostDelegate::AddExtraHeadersIfNeeded( if (request_info->GetResourceType() != content::RESOURCE_TYPE_MAIN_FRAME) return; - const content::PageTransition transition = request_info->GetPageTransition(); + const ui::PageTransition transition = request_info->GetPageTransition(); const bool is_load_url = - transition & content::PAGE_TRANSITION_FROM_API; + transition & ui::PAGE_TRANSITION_FROM_API; const bool is_go_back_forward = - transition & content::PAGE_TRANSITION_FORWARD_BACK; - const bool is_reload = content::PageTransitionCoreTypeIs( - transition, content::PAGE_TRANSITION_RELOAD); + transition & ui::PAGE_TRANSITION_FORWARD_BACK; + const bool is_reload = ui::PageTransitionCoreTypeIs( + transition, ui::PAGE_TRANSITION_RELOAD); if (is_load_url || is_go_back_forward || is_reload) { AwResourceContext* awrc = static_cast<AwResourceContext*>(resource_context); std::string extra_headers = awrc->GetExtraHeaders(request->url()); diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index a4d1119..fb2869e 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -55,10 +55,10 @@ import org.chromium.content_public.browser.JavaScriptCallback; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.NavigationController; import org.chromium.content_public.browser.NavigationHistory; -import org.chromium.content_public.browser.PageTransitionTypes; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.common.Referrer; import org.chromium.ui.base.ActivityWindowAndroid; +import org.chromium.ui.base.PageTransitionTypes; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.gfx.DeviceDisplayInfo; diff --git a/android_webview/java_library_common.mk b/android_webview/java_library_common.mk index ed85c6d..f07a523 100644 --- a/android_webview/java_library_common.mk +++ b/android_webview/java_library_common.mk @@ -50,13 +50,13 @@ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/PopupItemType.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/SelectionEventType.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \ -$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/browser/PageTransitionTypes.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/common/ScreenOrientationValues.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/ImageFormat.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateMimeType.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyStatusAndroid.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/PrivateKeyType.java \ +$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/base/PageTransitionTypes.java \ # content dependencies on java components that are provided by the system on # android diff --git a/android_webview/libwebviewchromium.gypi b/android_webview/libwebviewchromium.gypi index d5c40ed..c3259b3 100644 --- a/android_webview/libwebviewchromium.gypi +++ b/android_webview/libwebviewchromium.gypi @@ -17,7 +17,6 @@ '../base/base.gyp:base_java_memory_pressure_level_list', '../content/content.gyp:content_gamepad_mapping', '../content/content.gyp:gesture_event_type_java', - '../content/content.gyp:page_transition_types_java', '../content/content.gyp:popup_item_type_java', '../content/content.gyp:result_codes_java', '../content/content.gyp:screen_orientation_values_java', @@ -29,6 +28,7 @@ '../net/net.gyp:net_errors_java', '../net/net.gyp:private_key_types_java', '../ui/android/ui_android.gyp:bitmap_format_java', + '../ui/android/ui_android.gyp:page_transition_types_java', '../ui/android/ui_android.gyp:window_open_disposition_java', ], }], diff --git a/android_webview/native/permission/permission_request_handler.cc b/android_webview/native/permission/permission_request_handler.cc index bb6cce3..45d1f2d 100644 --- a/android_webview/native/permission/permission_request_handler.cc +++ b/android_webview/native/permission/permission_request_handler.cc @@ -82,10 +82,10 @@ void PermissionRequestHandler::PreauthorizePermission(const GURL& origin, void PermissionRequestHandler::NavigationEntryCommitted( const content::LoadCommittedDetails& details) { - const content::PageTransition transition = details.entry->GetTransitionType(); + const ui::PageTransition transition = details.entry->GetTransitionType(); if (details.is_navigation_to_different_page() || - content::PageTransitionStripQualifier(transition) == - content::PAGE_TRANSITION_RELOAD || + ui::PageTransitionStripQualifier(transition) == + ui::PAGE_TRANSITION_RELOAD || contents_unique_id_ != details.entry->GetUniqueID()) { CancelAllRequests(); contents_unique_id_ = details.entry->GetUniqueID(); diff --git a/apps/custom_launcher_page_contents.cc b/apps/custom_launcher_page_contents.cc index 7a2f4b2..37e7125 100644 --- a/apps/custom_launcher_page_contents.cc +++ b/apps/custom_launcher_page_contents.cc @@ -56,7 +56,7 @@ void CustomLauncherPageContents::Initialize(content::BrowserContext* context, web_contents_->GetController().LoadURL(url, content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } diff --git a/ash/screensaver/screensaver_view.cc b/ash/screensaver/screensaver_view.cc index a47ddce..7762a49 100644 --- a/ash/screensaver/screensaver_view.cc +++ b/ash/screensaver/screensaver_view.cc @@ -130,7 +130,7 @@ void ScreensaverView::LoadScreensaver() { screensaver_webview_->GetWebContents()->GetController().LoadURL( url_, content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } diff --git a/athena/content/render_view_context_menu_impl.cc b/athena/content/render_view_context_menu_impl.cc index 6c2f2b6..82f6098 100644 --- a/athena/content/render_view_context_menu_impl.cc +++ b/athena/content/render_view_context_menu_impl.cc @@ -226,7 +226,7 @@ void RenderViewContextMenuImpl::ExecuteCommand(int command_id, params_.link_url, params_.frame_url.is_empty() ? params_.page_url : params_.frame_url, NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); break; // Editable diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc index e56e5e9..05fa32f 100644 --- a/chrome/browser/android/tab_android.cc +++ b/chrome/browser/android/tab_android.cc @@ -511,7 +511,7 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env, // GoogleURLTracker uses the navigation pending notification to trigger the // infobar. if (google_util::IsGoogleSearchUrl(fixed_url) && - (page_transition & content::PAGE_TRANSITION_GENERATED)) { + (page_transition & ui::PAGE_TRANSITION_GENERATED)) { GoogleURLTracker* tracker = GoogleURLTrackerFactory::GetForProfile(GetProfile()); if (tracker) @@ -539,7 +539,7 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env, base::RefCountedBytes::TakeVector(&post_data); } load_params.transition_type = - content::PageTransitionFromInt(page_transition); + ui::PageTransitionFromInt(page_transition); if (j_referrer_url) { load_params.referrer = content::Referrer( GURL(base::android::ConvertJavaStringToUTF8(env, j_referrer_url)), diff --git a/chrome/browser/apps/app_browsertest_util.h b/chrome/browser/apps/app_browsertest_util.h index ad1ebd7..ceef7ed 100644 --- a/chrome/browser/apps/app_browsertest_util.h +++ b/chrome/browser/apps/app_browsertest_util.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ #include "chrome/browser/extensions/extension_apitest.h" -#include "content/public/common/page_transition_types.h" #include "extensions/browser/app_window/app_window.h" namespace base { diff --git a/chrome/browser/apps/app_url_redirector_browsertest.cc b/chrome/browser/apps/app_url_redirector_browsertest.cc index f94aae3..8dfd517 100644 --- a/chrome/browser/apps/app_url_redirector_browsertest.cc +++ b/chrome/browser/apps/app_url_redirector_browsertest.cc @@ -10,11 +10,11 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_base.h" #include "content/public/test/browser_test_utils.h" #include "extensions/test/extension_test_message_listener.h" #include "net/test/embedded_test_server/embedded_test_server.h" +#include "ui/base/page_transition_types.h" namespace extensions { @@ -92,7 +92,7 @@ class PlatformAppUrlRedirectorBrowserTest : public PlatformAppBrowserTest { // - waits for |handler| to launch and send back a |handler_start_message|; // - finally checks that the resulting app window count is as expected. void TestNavigationInBrowser(const char* matching_target_page, - content::PageTransition transition, + ui::PageTransition transition, const char* handler, const char* handler_start_message); @@ -100,14 +100,14 @@ class PlatformAppUrlRedirectorBrowserTest : public PlatformAppBrowserTest { // for form submissions, where the URL would normally match the url_handlers // but should not launch it. void TestNegativeNavigationInBrowser(const char* matching_target_page, - content::PageTransition transition, + ui::PageTransition transition, const char* success_tab_title, const char* handler); // Same as above, but expects the |mismatching_target_page| should not match // any of the |handler|'s url_handlers, and therefor not launch the app. void TestMismatchingNavigationInBrowser(const char* mismatching_target_page, - content::PageTransition transition, + ui::PageTransition transition, const char* success_tab_title, const char* handler); }; @@ -260,7 +260,7 @@ void PlatformAppUrlRedirectorBrowserTest::TestMismatchingNavigationInApp( void PlatformAppUrlRedirectorBrowserTest::TestNavigationInBrowser( const char* matching_target_page, - content::PageTransition transition, + ui::PageTransition transition, const char* handler, const char* handler_start_message) { ASSERT_TRUE(StartEmbeddedTestServer()); @@ -283,7 +283,7 @@ void PlatformAppUrlRedirectorBrowserTest::TestNavigationInBrowser( void PlatformAppUrlRedirectorBrowserTest::TestNegativeNavigationInBrowser( const char* matching_target_page, - content::PageTransition transition, + ui::PageTransition transition, const char* success_tab_title, const char* handler) { ASSERT_TRUE(StartEmbeddedTestServer()); @@ -308,7 +308,7 @@ void PlatformAppUrlRedirectorBrowserTest::TestNegativeNavigationInBrowser( void PlatformAppUrlRedirectorBrowserTest::TestMismatchingNavigationInBrowser( const char* mismatching_target_page, - content::PageTransition transition, + ui::PageTransition transition, const char* success_tab_title, const char* handler) { TestNegativeNavigationInBrowser( @@ -454,7 +454,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppUrlRedirectorBrowserTest, #endif TestNavigationInBrowser( "url_handlers/common/target.html", - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, "url_handlers/handlers/simple", "Handler launched"); } @@ -468,7 +468,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppUrlRedirectorBrowserTest, #endif TestMismatchingNavigationInBrowser( "url_handlers/common/mismatching_target.html", - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, "Mismatching link target loaded", "url_handlers/handlers/simple"); } diff --git a/chrome/browser/apps/ephemeral_app_launcher.cc b/chrome/browser/apps/ephemeral_app_launcher.cc index 5e7f771..ae4b13b 100644 --- a/chrome/browser/apps/ephemeral_app_launcher.cc +++ b/chrome/browser/apps/ephemeral_app_launcher.cc @@ -291,7 +291,7 @@ bool EphemeralAppLauncher::LaunchHostedApp(const Extension* extension) const { chrome::ScopedTabbedBrowserDisplayer displayer( profile(), chrome::GetHostDesktopTypeForNativeWindow(parent_window_)); chrome::NavigateParams params( - displayer.browser(), launch_url, content::PAGE_TRANSITION_AUTO_TOPLEVEL); + displayer.browser(), launch_url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); return true; diff --git a/chrome/browser/apps/install_chrome_app.cc b/chrome/browser/apps/install_chrome_app.cc index 525f31e..6ff3aa6 100644 --- a/chrome/browser/apps/install_chrome_app.cc +++ b/chrome/browser/apps/install_chrome_app.cc @@ -87,7 +87,7 @@ void InstallChromeApp(const std::string& app_id) { content::OpenURLParams params(GetAppInstallUrl(app_id), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false); browser->OpenURL(params); diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc index e240859..12700e91 100644 --- a/chrome/browser/autocomplete/autocomplete_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc @@ -184,7 +184,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) { content::NotificationService::AllSources()); chrome::AddSelectedTabWithURL(browser(), GURL(url::kAboutBlankURL), - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); observer.Wait(); EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText()); chrome::CloseTab(browser()); diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index ba1ffca..25b310c 100644 --- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc @@ -382,7 +382,7 @@ void AutocompleteProviderTest::RunKeywordTest(const base::string16& input, match.relevance = 1000; // Arbitrary non-zero value. match.allowed_to_be_default_match = true; match.fill_into_edit = match_data[i].fill_into_edit; - match.transition = content::PAGE_TRANSITION_KEYWORD; + match.transition = ui::PAGE_TRANSITION_KEYWORD; match.keyword = match_data[i].keyword; matches.push_back(match); } diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc index d9c4234..1d0e29e 100644 --- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc @@ -242,8 +242,8 @@ void HistoryQuickProviderTest::FillData() { "INSERT INTO \"visits\" VALUES(%" PRIuS ", %" PRIuS ", %" PRId64 ", 0, %d, 0, 1)", visit_id++, i + 1, visit_time.ToInternalValue(), - (j < cur.typed_count) ? content::PAGE_TRANSITION_TYPED : - content::PAGE_TRANSITION_LINK); + (j < cur.typed_count) ? ui::PAGE_TRANSITION_TYPED : + ui::PAGE_TRANSITION_LINK); sql::Statement sql_stmt(db.GetUniqueStatement(sql_cmd_line.c_str())); EXPECT_TRUE(sql_stmt.Run()); diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index ed289f7..264392a 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc @@ -462,7 +462,7 @@ TEST_F(HistoryURLProviderTest, CullRedirects) { redirects_to_a.push_back(GURL(test_cases[2].url)); redirects_to_a.push_back(GURL(test_cases[0].url)); history_service_->AddPage(GURL(test_cases[0].url), base::Time::Now(), - NULL, 0, GURL(), redirects_to_a, content::PAGE_TRANSITION_TYPED, + NULL, 0, GURL(), redirects_to_a, ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, true); // Because all the results are part of a redirect chain with other results, diff --git a/chrome/browser/autocomplete/shortcuts_backend.cc b/chrome/browser/autocomplete/shortcuts_backend.cc index f5f6148..dda7c5b 100644 --- a/chrome/browser/autocomplete/shortcuts_backend.cc +++ b/chrome/browser/autocomplete/shortcuts_backend.cc @@ -152,7 +152,7 @@ history::ShortcutsDatabase::Shortcut::MatchCore AutocompleteMatch::IsSpecializedSearchType(match.type) ? BaseSearchProvider::CreateSearchSuggestion( match.search_terms_args->search_terms, match_type, - (match.transition == content::PAGE_TRANSITION_KEYWORD), + (match.transition == ui::PAGE_TRANSITION_KEYWORD), match.GetTemplateURL(service, false), UIThreadSearchTermsData(profile)) : match; diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc index a69b391..106cf1c 100644 --- a/chrome/browser/autocomplete/shortcuts_provider.cc +++ b/chrome/browser/autocomplete/shortcuts_provider.cc @@ -200,8 +200,7 @@ AutocompleteMatch ShortcutsProvider::ShortcutToACMatch( match.description = shortcut.match_core.description; match.description_class = AutocompleteMatch::ClassificationsFromString( shortcut.match_core.description_class); - match.transition = - static_cast<content::PageTransition>(shortcut.match_core.transition); + match.transition = ui::PageTransitionFromInt(shortcut.match_core.transition); match.type = static_cast<AutocompleteMatch::Type>(shortcut.match_core.type); match.keyword = shortcut.match_core.keyword; match.RecordAdditionalInfo("number of hits", shortcut.number_of_hits); diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc index f6a86e7..7178cff 100644 --- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc @@ -53,7 +53,7 @@ struct TestShortcutInfo { std::string contents_class; std::string description; std::string description_class; - content::PageTransition transition; + ui::PageTransition transition; AutocompleteMatch::Type type; std::string keyword; int days_from_now; @@ -61,141 +61,141 @@ struct TestShortcutInfo { } shortcut_test_db[] = { { "BD85DBA2-8C29-49F9-84AE-48E1E90880E0", "goog", "www.google.com", "http://www.google.com/", "Google", "0,1,4,0", "Google", "0,3,4,1", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E1", "slash", "slashdot.org", "http://slashdot.org/", "slashdot.org", "0,3,5,1", "Slashdot - News for nerds, stuff that matters", "0,2,5,0", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 0, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 0, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E2", "news", "slashdot.org", "http://slashdot.org/", "slashdot.org", "0,1", "Slashdot - News for nerds, stuff that matters", "0,0,11,2,15,0", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 0, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 0, 5 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E3", "news", "sports.yahoo.com", "http://sports.yahoo.com/", "sports.yahoo.com", "0,1", "Yahoo! Sports - Sports News, Scores, Rumors, Fantasy Games, and more", - "0,0,23,2,27,0", content::PAGE_TRANSITION_TYPED, + "0,0,23,2,27,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 2, 5 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E4", "news weather", "www.cnn.com/index.html", "http://www.cnn.com/index.html", "www.cnn.com/index.html", "0,1", "CNN.com - Breaking News, U.S., World, Weather, Entertainment & Video", - "0,0,19,2,23,0,38,2,45,0", content::PAGE_TRANSITION_TYPED, + "0,0,19,2,23,0,38,2,45,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 1, 10 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E5", "nhl scores", "sports.yahoo.com", "http://sports.yahoo.com/", "sports.yahoo.com", "0,1", "Yahoo! Sports - Sports News, Scores, Rumors, Fantasy Games, and more", - "0,0,29,2,35,0", content::PAGE_TRANSITION_TYPED, + "0,0,29,2,35,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_BODY, "", 1, 10 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E6", "nhl scores", "www.nhl.com/scores/index.html", "http://www.nhl.com/scores/index.html", "www.nhl.com/scores/index.html", "0,1,4,3,7,1", "January 13, 2010 - NHL.com - Scores", "0,0,19,2,22,0,29,2,35,0", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 5, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 5, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E7", "just", "www.testsite.com/a.html", "http://www.testsite.com/a.html", "www.testsite.com/a.html", "0,1", "Test - site - just a test", "0,0,14,2,18,0", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 5, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 5, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E8", "just", "www.testsite.com/b.html", "http://www.testsite.com/b.html", "www.testsite.com/b.html", "0,1", "Test - site - just a test", "0,0,14,2,18,0", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 5, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 5, 2 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E9", "just", "www.testsite.com/c.html", "http://www.testsite.com/c.html", "www.testsite.com/c.html", "0,1", "Test - site - just a test", "0,0,14,2,18,0", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 8, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 8, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880EA", "just a", "www.testsite.com/d.html", "http://www.testsite.com/d.html", "www.testsite.com/d.html", "0,1", "Test - site - just a test", "0,0,14,2,18,0", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 12, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880EB", "just a t", "www.testsite.com/e.html", "http://www.testsite.com/e.html", "www.testsite.com/e.html", "0,1", "Test - site - just a test", - "0,0,14,2,18,0", content::PAGE_TRANSITION_TYPED, + "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 12, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880EC", "just a te", "www.testsite.com/f.html", "http://www.testsite.com/f.html", "www.testsite.com/f.html", "0,1", "Test - site - just a test", - "0,0,14,2,18,0", content::PAGE_TRANSITION_TYPED, + "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 12, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880ED", "ago", "www.daysagotest.com/a.html", "http://www.daysagotest.com/a.html", "www.daysagotest.com/a.html", - "0,1,8,3,11,1", "Test - site", "0,0", content::PAGE_TRANSITION_TYPED, + "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880EE", "ago", "www.daysagotest.com/b.html", "http://www.daysagotest.com/b.html", "www.daysagotest.com/b.html", - "0,1,8,3,11,1", "Test - site", "0,0", content::PAGE_TRANSITION_TYPED, + "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 2, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880EF", "ago", "www.daysagotest.com/c.html", "http://www.daysagotest.com/c.html", "www.daysagotest.com/c.html", - "0,1,8,3,11,1", "Test - site", "0,0", content::PAGE_TRANSITION_TYPED, + "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 3, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880F0", "ago", "www.daysagotest.com/d.html", "http://www.daysagotest.com/d.html", "www.daysagotest.com/d.html", - "0,1,8,3,11,1", "Test - site", "0,0", content::PAGE_TRANSITION_TYPED, + "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 4, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880F1", "echo echo", "echo echo", "chrome-extension://cedabbhfglmiikkmdgcpjdkocfcmbkee/?q=echo", "Run Echo command: echo", "0,0", "Echo", "0,4", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::EXTENSION_APP, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::EXTENSION_APP, "echo", 1, 1 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880F2", "abcdef.com", "http://abcdef.com", "http://abcdef.com/", "Abcdef", "0,1,4,0", "Abcdef", "0,3,4,1", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880F3", "query", "query", "https://www.google.com/search?q=query", "query", "0,0", - "Google Search", "0,4", content::PAGE_TRANSITION_GENERATED, + "Google Search", "0,4", ui::PAGE_TRANSITION_GENERATED, AutocompleteMatchType::SEARCH_HISTORY, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880F4", "word", "www.word", "https://www.google.com/search?q=www.word", "www.word", "0,0", - "Google Search", "0,4", content::PAGE_TRANSITION_GENERATED, + "Google Search", "0,4", ui::PAGE_TRANSITION_GENERATED, AutocompleteMatchType::SEARCH_HISTORY, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880F5", "about:o", "chrome://omnibox", "chrome://omnibox/", "about:omnibox", "0,3,10,1", "", "", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::NAVSUGGEST, "", + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::NAVSUGGEST, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880F6", "www/real sp", "http://www/real space/long-url-with-space.html", "http://www/real%20space/long-url-with-space.html", "www/real space/long-url-with-space.html", "0,3,11,1", "Page With Space; Input with Space", "0,0", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880F7", "duplicate", "http://duplicate.com", "http://duplicate.com/", "Duplicate", "0,1", "Duplicate", "0,1", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880F8", "dupl", "http://duplicate.com", "http://duplicate.com/", "Duplicate", "0,1", "Duplicate", "0,1", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880F9", "notrailing.com/", "http://notrailing.com", "http://notrailing.com/", "No Trailing Slash", "0,1", "No Trailing Slash on fill_into_edit", "0,1", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880FA", "http:///foo.com", "http://foo.com", "http://foo.com/", "Foo - Typo in Input", "0,1", "Foo - Typo in Input Corrected in fill_into_edit", "0,1", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880FB", "trailing1 ", "http://trailing1.com", "http://trailing1.com/", "Trailing1 - Space in Shortcut", "0,1", - "Trailing1 - Space in Shortcut", "0,1", content::PAGE_TRANSITION_TYPED, + "Trailing1 - Space in Shortcut", "0,1", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100 }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880FC", "about:trailing2 ", "chrome://trailing2blah", "chrome://trailing2blah/", "Trailing2 - Space in Shortcut", "0,1", - "Trailing2 - Space in Shortcut", "0,1", content::PAGE_TRANSITION_TYPED, + "Trailing2 - Space in Shortcut", "0,1", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100 }, }; @@ -714,7 +714,7 @@ TEST_F(ShortcutsProviderTest, CalculateScore) { history::ShortcutsDatabase::Shortcut::MatchCore( ASCIIToUTF16("www.test.com"), GURL("http://www.test.com"), ASCIIToUTF16("www.test.com"), "0,1,4,3,8,1", - ASCIIToUTF16("A test"), "0,0,2,2", content::PAGE_TRANSITION_TYPED, + ASCIIToUTF16("A test"), "0,0,2,2", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, base::string16()), base::Time::Now(), 1); @@ -765,19 +765,19 @@ TEST_F(ShortcutsProviderTest, DeleteMatch) { TestShortcutInfo shortcuts_to_test_delete[] = { { "BD85DBA2-8C29-49F9-84AE-48E1E90881F1", "delete", "www.deletetest.com/1", "http://www.deletetest.com/1", "http://www.deletetest.com/1", "0,2", - "Erase this shortcut!", "0,0", content::PAGE_TRANSITION_TYPED, + "Erase this shortcut!", "0,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 1}, { "BD85DBA2-8C29-49F9-84AE-48E1E90881F2", "erase", "www.deletetest.com/1", "http://www.deletetest.com/1", "http://www.deletetest.com/1", "0,2", - "Erase this shortcut!", "0,0", content::PAGE_TRANSITION_TYPED, + "Erase this shortcut!", "0,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 1, 1}, { "BD85DBA2-8C29-49F9-84AE-48E1E90881F3", "keep", "www.deletetest.com/1/2", "http://www.deletetest.com/1/2", "http://www.deletetest.com/1/2", "0,2", - "Keep this shortcut!", "0,0", content::PAGE_TRANSITION_TYPED, + "Keep this shortcut!", "0,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 1, 1}, { "BD85DBA2-8C29-49F9-84AE-48E1E90881F4", "delete", "www.deletetest.com/2", "http://www.deletetest.com/2", "http://www.deletetest.com/2", "0,2", - "Erase this shortcut!", "0,0", content::PAGE_TRANSITION_TYPED, + "Erase this shortcut!", "0,0", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 1}, }; diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 41de965..4c2bd54 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -164,7 +164,7 @@ class AutofillTest : public InProcessBrowserTest { void FillFormAndSubmit(const std::string& filename, const FormMap& data) { GURL url = test_server()->GetURL("files/autofill/" + filename); chrome::NavigateParams params(browser(), url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; ui_test_utils::NavigateToURL(¶ms); diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc index c33b38a..f2fd9ea 100644 --- a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc +++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc @@ -106,7 +106,7 @@ bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { content::OpenURLParams( GURL(autofill::kHelpURL), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } diff --git a/chrome/browser/autofill/content_autofill_driver_browsertest.cc b/chrome/browser/autofill/content_autofill_driver_browsertest.cc index 81f9f10..f40087b 100644 --- a/chrome/browser/autofill/content_autofill_driver_browsertest.cc +++ b/chrome/browser/autofill/content_autofill_driver_browsertest.cc @@ -128,7 +128,7 @@ IN_PROC_BROWSER_TEST_F(ContentAutofillDriverBrowserTest, web_contents_hidden_callback_ = runner->QuitClosure(); chrome::AddSelectedTabWithURL(browser(), GURL(url::kAboutBlankURL), - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); runner->Run(); web_contents_hidden_callback_.Reset(); } @@ -145,12 +145,12 @@ IN_PROC_BROWSER_TEST_F(ContentAutofillDriverBrowserTest, browser()->OpenURL(content::OpenURLParams(GURL(chrome::kChromeUIBookmarksURL), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); browser()->OpenURL(content::OpenURLParams(GURL(chrome::kChromeUIAboutURL), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); runner->Run(); nav_entry_committed_callback_.Reset(); diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc index e263c96..41847f1 100644 --- a/chrome/browser/background/background_contents_service.cc +++ b/chrome/browser/background/background_contents_service.cc @@ -639,7 +639,7 @@ void BackgroundContentsService::LoadBackgroundContents( // TODO(atwilson): Create RenderViews asynchronously to avoid increasing // startup latency (http://crbug.com/47236). contents->web_contents()->GetController().LoadURL( - url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); + url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); } BackgroundContents* BackgroundContentsService::CreateBackgroundContents( diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index 5666c28..17d88fc 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -71,7 +71,7 @@ TEST_F(BrowserCommandsTest, DuplicateTab) { content::NavigationController& orig_controller = browser()->tab_strip_model()->GetWebContentsAt(0)->GetController(); orig_controller.LoadURL( - url4, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); + url4, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); EXPECT_EQ(3, orig_controller.GetEntryCount()); EXPECT_TRUE(orig_controller.GetPendingEntry()); @@ -108,7 +108,7 @@ TEST_F(BrowserCommandsTest, ViewSource) { content::NavigationController& orig_controller = browser()->tab_strip_model()->GetWebContentsAt(0)->GetController(); orig_controller.LoadURL( - url2, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); + url2, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); EXPECT_EQ(1, orig_controller.GetEntryCount()); EXPECT_TRUE(orig_controller.GetPendingEntry()); @@ -146,7 +146,7 @@ TEST_F(BrowserCommandsTest, BookmarkCurrentPage) { GURL url1("http://foo/1"); AddTab(browser(), url1); browser()->OpenURL(OpenURLParams( - url1, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); + url1, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); chrome::BookmarkCurrentPage(browser()); diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 1dc599b..0799242 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc @@ -408,7 +408,7 @@ class RemoveHistoryTester { void AddHistory(const GURL& url, base::Time time) { history_service_->AddPage(url, time, NULL, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_LINK, + history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); } diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index a3a454e..24c98fa 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -1515,7 +1515,7 @@ void CaptivePortalBrowserTest::RunNavigateLoadingTabToTimeoutTest( browser->OpenURL(content::OpenURLParams(timeout_url, content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); portal_observer.WaitForResults(1); EXPECT_FALSE(CheckPending(browser)); @@ -2102,7 +2102,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) { // window. chrome::NavigateParams params(inactive_browser, GURL(kMockHttpsQuickTimeoutUrl), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); params.disposition = NEW_BACKGROUND_TAB; params.window_action = chrome::NavigateParams::NO_ACTION; ui_test_utils::NavigateToURL(¶ms); diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.cc b/chrome/browser/captive_portal/captive_portal_tab_helper.cc index 2d2c1e1..bd4895b 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.cc @@ -100,7 +100,7 @@ void CaptivePortalTabHelper::DidStartProvisionalLoadForFrame( void CaptivePortalTabHelper::DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { DCHECK(CalledOnValidThread()); // Ignore subframes. @@ -260,7 +260,7 @@ void CaptivePortalTabHelper::OpenLoginTab() { content::WebContents* web_contents = chrome::AddSelectedTabWithURL( browser, CaptivePortalServiceFactory::GetForProfile(profile_)->test_url(), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); CaptivePortalTabHelper* captive_portal_tab_helper = CaptivePortalTabHelper::FromWebContents(web_contents); captive_portal_tab_helper->SetIsLoginTab(); diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.h b/chrome/browser/captive_portal/captive_portal_tab_helper.h index 5379291..fa4c92c 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper.h +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.h @@ -75,7 +75,7 @@ class CaptivePortalTabHelper virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; virtual void DidFailProvisionalLoad( content::RenderFrameHost* render_frame_host, diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc index 55b8943..f9884df 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc @@ -95,7 +95,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness { tab_helper().DidCommitProvisionalLoadForFrame( render_view_host->GetMainFrame(), url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); } // Simulates a connection timeout while requesting |url|. @@ -118,7 +118,7 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness { tab_helper().DidCommitProvisionalLoadForFrame( render_view_host->GetMainFrame(), GURL(kErrorPageUrl), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); } // Simulates an abort while requesting |url|. @@ -267,7 +267,7 @@ TEST_F(CaptivePortalTabHelperTest, HttpTimeoutLinkDoctor) { EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1); tab_helper().DidCommitProvisionalLoadForFrame(main_render_frame1(), GURL(kErrorPageUrl), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); tab_helper().DidStopLoading(render_view_host1()); } @@ -367,7 +367,7 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedProvisionalLoad) { EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_FAILED)).Times(1); tab_helper().DidCommitProvisionalLoadForFrame(main_render_frame2(), GURL(kErrorPageUrl), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); } // Similar to the above test, except the original RenderViewHost manages to @@ -403,7 +403,7 @@ TEST_F(CaptivePortalTabHelperTest, UnexpectedCommit) { OnLoadStart(same_site_url.SchemeIsSecure())).Times(1); EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1); tab_helper().DidCommitProvisionalLoadForFrame( - main_render_frame1(), same_site_url, content::PAGE_TRANSITION_LINK); + main_render_frame1(), same_site_url, ui::PAGE_TRANSITION_LINK); } // Simulates navigations for a number of subframes, and makes sure no @@ -419,7 +419,7 @@ TEST_F(CaptivePortalTabHelperTest, HttpsSubframe) { // Normal load. tab_helper().DidStartProvisionalLoadForFrame(subframe1, url, false, false); tab_helper().DidCommitProvisionalLoadForFrame( - subframe1, url, content::PAGE_TRANSITION_LINK); + subframe1, url, ui::PAGE_TRANSITION_LINK); // Timeout. content::RenderFrameHost* subframe2 = @@ -468,10 +468,10 @@ TEST_F(CaptivePortalTabHelperTest, HttpsSubframeParallelError) { // Error page load finishes. tab_helper().DidCommitProvisionalLoadForFrame( - subframe, url, content::PAGE_TRANSITION_AUTO_SUBFRAME); + subframe, url, ui::PAGE_TRANSITION_AUTO_SUBFRAME); EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_UNEXPECTED)).Times(1); tab_helper().DidCommitProvisionalLoadForFrame( - main_render_frame1(), url, content::PAGE_TRANSITION_LINK); + main_render_frame1(), url, ui::PAGE_TRANSITION_LINK); } // Simulates an HTTP to HTTPS redirect, which then times out. @@ -499,7 +499,7 @@ TEST_F(CaptivePortalTabHelperTest, HttpToHttpsRedirectTimeout) { EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_TIMED_OUT)).Times(1); tab_helper().DidCommitProvisionalLoadForFrame(main_render_frame1(), GURL(kErrorPageUrl), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); } // Simulates an HTTPS to HTTP redirect. @@ -517,7 +517,7 @@ TEST_F(CaptivePortalTabHelperTest, HttpsToHttpRedirect) { EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1); tab_helper().DidCommitProvisionalLoadForFrame( - main_render_frame1(), http_url, content::PAGE_TRANSITION_LINK); + main_render_frame1(), http_url, ui::PAGE_TRANSITION_LINK); } // Simulates an HTTPS to HTTPS redirect. @@ -534,7 +534,7 @@ TEST_F(CaptivePortalTabHelperTest, HttpToHttpRedirect) { EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1); tab_helper().DidCommitProvisionalLoadForFrame( - main_render_frame1(), http_url, content::PAGE_TRANSITION_LINK); + main_render_frame1(), http_url, ui::PAGE_TRANSITION_LINK); } // Tests that a subframe redirect doesn't reset the timer to kick off a captive @@ -552,7 +552,7 @@ TEST_F(CaptivePortalTabHelperTest, SubframeRedirect) { EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1); tab_helper().DidCommitProvisionalLoadForFrame( - main_render_frame1(), GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK); + main_render_frame1(), GURL(kErrorPageUrl), ui::PAGE_TRANSITION_LINK); } // Simulates a redirect, for another RenderViewHost. @@ -581,7 +581,7 @@ TEST_F(CaptivePortalTabHelperTest, OtherRenderViewHostRedirect) { EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_TIMED_OUT)).Times(1); tab_helper().DidCommitProvisionalLoadForFrame(main_render_frame1(), GURL(kErrorPageUrl), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); } TEST_F(CaptivePortalTabHelperTest, LoginTabLogin) { diff --git a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc index 31f6935..b569c562 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc +++ b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc @@ -14,12 +14,12 @@ #include "chrome/grit/generated_resources.h" #include "components/web_modal/popup_manager.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" #include "grit/components_strings.h" #include "ui/aura/window.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #include "ui/views/border.h" #include "ui/views/controls/styled_label.h" #include "ui/views/layout/fill_layout.h" @@ -137,7 +137,7 @@ void PlatformVerificationDialog::StyledLabelLinkClicked(const gfx::Range& range, Profile* profile = Profile::FromBrowserContext( web_contents_->GetBrowserContext()); chrome::NavigateParams params( - profile, learn_more_url, content::PAGE_TRANSITION_LINK); + profile, learn_more_url, ui::PAGE_TRANSITION_LINK); params.disposition = SINGLETON_TAB; chrome::Navigate(¶ms); } else { diff --git a/chrome/browser/chromeos/dbus/printer_service_provider.cc b/chrome/browser/chromeos/dbus/printer_service_provider.cc index 7813159..f3d8905 100644 --- a/chrome/browser/chromeos/dbus/printer_service_provider.cc +++ b/chrome/browser/chromeos/dbus/printer_service_provider.cc @@ -78,7 +78,7 @@ void FindOrOpenCloudPrintPage(const std::string& /* vendor */, UMA_HISTOGRAM_ENUMERATION("PrinterService.PrinterServiceEvent", PAGE_DISPLAYED, PRINTER_SERVICE_EVENT_MAX); chrome::AddSelectedTabWithURL(displayer.browser(), url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); } } diff --git a/chrome/browser/chromeos/drive/file_task_executor.cc b/chrome/browser/chromeos/drive/file_task_executor.cc index 9ed721b..7aaf7d36 100644 --- a/chrome/browser/chromeos/drive/file_task_executor.cc +++ b/chrome/browser/chromeos/drive/file_task_executor.cc @@ -44,7 +44,7 @@ class FileTaskExecutorDelegateImpl : public FileTaskExecutorDelegate { chrome::ScopedTabbedBrowserDisplayer displayer( profile_, chrome::HOST_DESKTOP_TYPE_ASH); chrome::AddSelectedTabWithURL(displayer.browser(), open_link, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); // Since the ScopedTabbedBrowserDisplayer does not guarantee that the // browser will be shown on the active desktop, we ensure the visibility. multi_user_util::MoveWindowToCurrentDesktop( diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc index 6de6e28..ac22596 100644 --- a/chrome/browser/chromeos/enrollment_dialog_view.cc +++ b/chrome/browser/chromeos/enrollment_dialog_view.cc @@ -17,10 +17,10 @@ #include "chromeos/network/network_event_log.h" #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" -#include "content/public/common/page_transition_types.h" #include "extensions/browser/extension_host.h" #include "extensions/common/constants.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #include "ui/views/controls/label.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" @@ -124,7 +124,7 @@ void EnrollmentDialogView::OnClosed() { return; chrome::NavigateParams params(profile_, GURL(target_uri_), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; params.window_action = chrome::NavigateParams::SHOW_WINDOW; chrome::Navigate(¶ms); diff --git a/chrome/browser/chromeos/extensions/echo_private_api.cc b/chrome/browser/chromeos/extensions/echo_private_api.cc index 7f78bd3..8b07620 100644 --- a/chrome/browser/chromeos/extensions/echo_private_api.cc +++ b/chrome/browser/chromeos/extensions/echo_private_api.cc @@ -214,7 +214,7 @@ void EchoPrivateGetUserConsentFunction::OnCancel() { void EchoPrivateGetUserConsentFunction::OnMoreInfoLinkClicked() { chrome::NavigateParams params( - GetProfile(), GURL(kMoreInfoLink), content::PAGE_TRANSITION_LINK); + GetProfile(), GURL(kMoreInfoLink), ui::PAGE_TRANSITION_LINK); // Open the link in a new window. The echo dialog is modal, so the current // window is useless until the dialog is closed. params.disposition = NEW_WINDOW; diff --git a/chrome/browser/chromeos/file_manager/open_with_browser.cc b/chrome/browser/chromeos/file_manager/open_with_browser.cc index 99e3c74..a1cc3c4 100644 --- a/chrome/browser/chromeos/file_manager/open_with_browser.cc +++ b/chrome/browser/chromeos/file_manager/open_with_browser.cc @@ -108,7 +108,7 @@ void OpenNewTab(Profile* profile, const GURL& url) { chrome::ScopedTabbedBrowserDisplayer displayer( profile, chrome::HOST_DESKTOP_TYPE_ASH); chrome::AddSelectedTabWithURL(displayer.browser(), url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); // Since the ScopedTabbedBrowserDisplayer does not guarantee that the // browser will be shown on the active desktop, we ensure the visibility. diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc index c69b2ed..57f5daf 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc @@ -221,7 +221,7 @@ void DriveWebContentsManager::StartLoad() { web_contents_.get()); content::NavigationController::LoadURLParams load_params(url); - load_params.transition_type = content::PAGE_TRANSITION_GENERATED; + load_params.transition_type = ui::PAGE_TRANSITION_GENERATED; web_contents_->GetController().LoadURLWithParams(load_params); content::WebContentsObserver::Observe(web_contents_.get()); @@ -318,7 +318,7 @@ bool DriveWebContentsManager::ShouldCreateWebContents( contents->web_contents()->GetController().LoadURL( target_url, content::Referrer(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, std::string()); // Return false as we already created the WebContents here. diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc index b23327b..72084a3 100644 --- a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc +++ b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc @@ -73,7 +73,7 @@ class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness { void Navigate(const char* url, int page_id) { WebContentsTester::For(web_contents())->TestDidNavigate( web_contents()->GetMainFrame(), page_id, GURL(url), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); } void ShowInterstitial(const char* url) { @@ -126,7 +126,7 @@ TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShown) { Navigate(kURL1, 1); // Load next page. controller().LoadURL(GURL(kURL2), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the load causing an merge session interstitial page // to be shown. @@ -144,7 +144,7 @@ TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShownOnTimeout) { Navigate(kURL1, 1); // Load next page. controller().LoadURL(GURL(kURL2), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the load causing an merge session interstitial page // to be shown. @@ -159,7 +159,7 @@ TEST_F(MergeSessionLoadPageTest, MergeSessionPageShown) { Navigate(kURL1, 1); // Load next page. controller().LoadURL(GURL(kURL2), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the load causing an merge session interstitial page // to be shown. diff --git a/chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc b/chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc index 66b6272..8376de3 100644 --- a/chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc +++ b/chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc @@ -34,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) { content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(), - CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false); + CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false); browser()->OpenURL(open1); load1.Wait(); @@ -42,7 +42,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) { content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED, + NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false); browser()->OpenURL(open2); load2.Wait(); @@ -51,7 +51,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) { content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); OpenURLParams open3(GURL(chrome::kChromeUITermsURL), content::Referrer(), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED, + NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false); browser()->OpenURL(open3); load3.Wait(); @@ -64,7 +64,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) { content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); OpenURLParams open4(GURL(chrome::kChromeUIVersionURL), content::Referrer(), - CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false); browser()->OpenURL(open4); load4.Wait(); @@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) { content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); OpenURLParams open5(GURL("chrome://dns"), content::Referrer(), - CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false); browser()->OpenURL(open5); load5.Wait(); diff --git a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc index c94534a..f07205ef 100644 --- a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc +++ b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc @@ -64,7 +64,7 @@ class OfflineLoadPageTest : public ChromeRenderViewHostTestHarness { void Navigate(const char* url, int page_id) { WebContentsTester::For(web_contents())->TestDidNavigate( web_contents()->GetMainFrame(), page_id, GURL(url), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); } void ShowInterstitial(const char* url) { @@ -94,7 +94,7 @@ TEST_F(OfflineLoadPageTest, OfflinePageProceed) { Navigate(kURL1, 1); // Load next page. controller().LoadURL(GURL(kURL2), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the load causing an offline browsing interstitial page // to be shown. @@ -122,7 +122,7 @@ TEST_F(OfflineLoadPageTest, OfflinePageDontProceed) { // Start a load. Navigate(kURL1, 1); controller().LoadURL(GURL(kURL2), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the load causing an offline interstitial page to be shown. ShowInterstitial(kURL2); diff --git a/chrome/browser/chromeos/policy/consumer_management_service.cc b/chrome/browser/chromeos/policy/consumer_management_service.cc index 232b8e8..448b97d 100644 --- a/chrome/browser/chromeos/policy/consumer_management_service.cc +++ b/chrome/browser/chromeos/policy/consumer_management_service.cc @@ -38,7 +38,6 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" -#include "content/public/common/page_transition_types.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/google_service_auth_error.h" #include "grit/generated_resources.h" @@ -46,6 +45,7 @@ #include "policy/proto/device_management_backend.pb.h" #include "third_party/WebKit/public/web/WebTextDirection.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/window_open_disposition.h" #include "ui/message_center/notification.h" @@ -514,7 +514,7 @@ void ConsumerManagementService::ShowDesktopNotificationAndResetStage( void ConsumerManagementService::OpenSettingsPage(Profile* profile) const { const GURL url(chrome::kChromeUISettingsURL); - chrome::NavigateParams params(profile, url, content::PAGE_TRANSITION_LINK); + chrome::NavigateParams params(profile, url, ui::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); } @@ -523,7 +523,7 @@ void ConsumerManagementService::TryEnrollmentAgain(Profile* profile) const { const GURL base_url(chrome::kChromeUISettingsURL); const GURL url = base_url.Resolve(kConsumerManagementOverlay); - chrome::NavigateParams params(profile, url, content::PAGE_TRANSITION_LINK); + chrome::NavigateParams params(profile, url, ui::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); } diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index f663044..f9aa38d 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -15,12 +15,12 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" using content::OpenURLParams; using content::Referrer; @@ -37,7 +37,7 @@ void SimulateRendererCrash(Browser* browser) { content::NotificationService::AllSources()); browser->OpenURL(OpenURLParams( GURL(content::kChromeUICrashURL), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); observer.Wait(); } diff --git a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc index 4b830c6..6e06332 100644 --- a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc +++ b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc @@ -122,7 +122,7 @@ bool RegisterProtocolHandlerInfoBarDelegate::LinkClicked( GURL(chrome::kLearnMoreRegisterProtocolHandlerURL), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc index dcc7157..4ddb06f 100644 --- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc +++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc @@ -103,7 +103,7 @@ std::string BrowserListTabContentsProvider::GetPageThumbnailData( scoped_ptr<DevToolsTarget> BrowserListTabContentsProvider::CreateNewTarget(const GURL& url) { chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), - url, content::PAGE_TRANSITION_AUTO_TOPLEVEL); + url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); if (!params.target_contents) diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc index 5dafffb..c7d11cd 100644 --- a/chrome/browser/devtools/devtools_ui_bindings.cc +++ b/chrome/browser/devtools/devtools_ui_bindings.cc @@ -43,13 +43,13 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/renderer_preferences.h" #include "content/public/common/url_constants.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension_set.h" #include "extensions/common/permissions/permissions_data.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" using base::DictionaryValue; using content::BrowserThread; @@ -208,7 +208,7 @@ void DefaultBindingsDelegate::ActivateWindow() { void DefaultBindingsDelegate::OpenInNewTab(const std::string& url) { content::OpenURLParams params( GURL(url), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); Browser* browser = FindBrowser(web_contents_); browser->OpenURL(params); } diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index 78e75f4..072b1e8 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -44,9 +44,9 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/url_constants.h" #include "third_party/WebKit/public/web/WebInputEvent.h" +#include "ui/base/page_transition_types.h" #include "ui/events/keycodes/keyboard_codes.h" using base::DictionaryValue; @@ -684,7 +684,7 @@ DevToolsWindow::DevToolsWindow(Profile* profile, main_web_contents_->GetController().LoadURL( DevToolsUIBindings::ApplyThemeToURL(profile, url), content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); bindings_ = DevToolsUIBindings::ForWebContents(main_web_contents_); DCHECK(bindings_); @@ -1044,7 +1044,7 @@ void DevToolsWindow::SetIsDocked(bool dock_requested) { void DevToolsWindow::OpenInNewTab(const std::string& url) { content::OpenURLParams params( GURL(url), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); WebContents* inspected_web_contents = GetInspectedWebContents(); if (inspected_web_contents) { inspected_web_contents->OpenURL(params); @@ -1142,7 +1142,7 @@ void DevToolsWindow::CreateDevToolsBrowser() { chrome::GetHostDesktopTypeForNativeView( main_web_contents_->GetNativeView()))); browser_->tab_strip_model()->AddWebContents( - main_web_contents_, -1, content::PAGE_TRANSITION_AUTO_TOPLEVEL, + main_web_contents_, -1, ui::PAGE_TRANSITION_AUTO_TOPLEVEL, TabStripModel::ADD_ACTIVE); main_web_contents_->GetRenderViewHost()->SyncRendererPrefs(); } diff --git a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc index 20a5aef..4912f6c 100644 --- a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc +++ b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc @@ -255,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest, // Navigate to a URL and wait for the distiller to flush contents to the page. GURL url(dom_distiller::url_utils::GetDistillerViewUrlFromUrl( kDomDistillerScheme, GURL("http://urlthatlooksvalid.com"))); - chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_TYPED); + chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_TYPED); chrome::Navigate(¶ms); distillation_done_runner->Run(); diff --git a/chrome/browser/dom_distiller/tab_utils.cc b/chrome/browser/dom_distiller/tab_utils.cc index 6cf5e14..6b43639 100644 --- a/chrome/browser/dom_distiller/tab_utils.cc +++ b/chrome/browser/dom_distiller/tab_utils.cc @@ -105,7 +105,7 @@ void StartNavigationToDistillerViewer(content::WebContents* web_contents, GURL viewer_url = dom_distiller::url_utils::GetDistillerViewUrlFromUrl( dom_distiller::kDomDistillerScheme, url); content::NavigationController::LoadURLParams params(viewer_url); - params.transition_type = content::PAGE_TRANSITION_AUTO_BOOKMARK; + params.transition_type = ui::PAGE_TRANSITION_AUTO_BOOKMARK; web_contents->GetController().LoadURLWithParams(params); } diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index b805c4b..67bf169 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -450,7 +450,7 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) { net::FilePathToFileURL(download->GetTargetFilePath()), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); browser->OpenURL(params); RecordDownloadOpenMethod(DOWNLOAD_OPEN_METHOD_DEFAULT_BROWSER); diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc index 1262e0a..bb67541 100644 --- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc +++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc @@ -218,7 +218,7 @@ content::MockDownloadItem* ON_CALL(*item, GetTargetFilePath()) .WillByDefault(ReturnRefOfCopy(base::FilePath())); ON_CALL(*item, GetTransitionType()) - .WillByDefault(Return(content::PAGE_TRANSITION_LINK)); + .WillByDefault(Return(ui::PAGE_TRANSITION_LINK)); ON_CALL(*item, GetWebContents()) .WillByDefault(Return(web_contents())); ON_CALL(*item, HasUserGesture()) diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 316d7e72..b939bf0 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -78,7 +78,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "content/public/common/context_menu_params.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/download_test_observer.h" #include "content/public/test/test_file_error_injector.h" @@ -91,6 +90,7 @@ #include "net/test/url_request/url_request_mock_http_job.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #if defined(FULL_SAFE_BROWSING) #include "chrome/browser/safe_browsing/download_feedback_service.h" @@ -1342,7 +1342,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, PerWindowShelf) { EXPECT_NE(static_cast<WebContents*>(NULL), chrome::AddSelectedTabWithURL(browser(), GURL(url::kAboutBlankURL), - content::PAGE_TRANSITION_TYPED)); + ui::PAGE_TRANSITION_TYPED)); EXPECT_EQ(2, browser()->tab_strip_model()->count()); EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible()); diff --git a/chrome/browser/download/download_request_limiter.cc b/chrome/browser/download/download_request_limiter.cc index 7486661..407bab0 100644 --- a/chrome/browser/download/download_request_limiter.cc +++ b/chrome/browser/download/download_request_limiter.cc @@ -205,7 +205,7 @@ void DownloadRequestLimiter::TabDownloadState::Observe( return; // Redirects don't count. - if (content::PageTransitionIsRedirect(entry->GetTransitionType())) + if (ui::PageTransitionIsRedirect(entry->GetTransitionType())) return; if (status_ == DownloadRequestLimiter::ALLOW_ALL_DOWNLOADS || diff --git a/chrome/browser/download/download_shelf_context_menu.cc b/chrome/browser/download/download_shelf_context_menu.cc index 7e39b8b..81d7a4e 100644 --- a/chrome/browser/download/download_shelf_context_menu.cc +++ b/chrome/browser/download/download_shelf_context_menu.cc @@ -217,7 +217,7 @@ void DownloadShelfContextMenu::ExecuteCommand(int command_id, int event_flags) { content::OpenURLParams(GURL(chrome::kDownloadInterruptedLearnMoreURL), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); break; } diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc index c0f44b6..c750432 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc @@ -849,7 +849,7 @@ bool DownloadTargetDeterminer::IsDangerousFile(PriorVisitsToReferrer visits) { // "Allow on user gesture" is OK when we have a user gesture and the // hosting page has been visited before today. if (download_->GetTransitionType() & - content::PAGE_TRANSITION_FROM_ADDRESS_BAR) { + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) { return false; } return !download_->HasUserGesture() || visits == NO_VISITS_TO_REFERRER; diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc index 06ed1f2..ebfaf26 100644 --- a/chrome/browser/download/download_target_determiner_unittest.cc +++ b/chrome/browser/download/download_target_determiner_unittest.cc @@ -318,7 +318,7 @@ DownloadTargetDeterminerTest::CreateActiveDownloadItem( ON_CALL(*item, GetTargetFilePath()) .WillByDefault(ReturnRefOfCopy(base::FilePath())); ON_CALL(*item, GetTransitionType()) - .WillByDefault(Return(content::PAGE_TRANSITION_LINK)); + .WillByDefault(Return(ui::PAGE_TRANSITION_LINK)); ON_CALL(*item, GetURL()) .WillByDefault(ReturnRefOfCopy(download_url)); ON_CALL(*item, GetUrlChain()) diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc index efa00dc..eebdfe3 100644 --- a/chrome/browser/extensions/active_tab_unittest.cc +++ b/chrome/browser/extensions/active_tab_unittest.cc @@ -22,7 +22,6 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" #include "content/public/common/frame_navigate_params.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/test_browser_thread.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index 6d9ec59..1ac2b66 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc @@ -39,7 +39,6 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/download_test_observer.h" #include "content/test/net/url_request_slow_download_job.h" #include "extensions/browser/event_router.h" @@ -54,6 +53,7 @@ #include "storage/browser/fileapi/file_system_context.h" #include "storage/browser/fileapi/file_system_operation_runner.h" #include "storage/browser/fileapi/file_system_url.h" +#include "ui/base/page_transition_types.h" using content::BrowserContext; using content::BrowserThread; @@ -275,7 +275,7 @@ class DownloadExtensionTest : public ExtensionApiTest { content::WebContents* tab = chrome::AddSelectedTabWithURL( current_browser(), extension_->GetResourceURL("empty.html"), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); EventRouter::Get(current_browser()->profile()) ->AddEventListener(downloads::OnCreated::kEventName, tab->GetRenderProcessHost(), @@ -296,7 +296,7 @@ class DownloadExtensionTest : public ExtensionApiTest { content::WebContents* tab = chrome::AddSelectedTabWithURL( current_browser(), extension_->GetResourceURL("empty.html"), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); EventRouter::Get(current_browser()->profile()) ->AddEventListener(downloads::OnDeterminingFilename::kEventName, tab->GetRenderProcessHost(), @@ -586,7 +586,7 @@ class DownloadExtensionTest : public ExtensionApiTest { content::WebContents* tab = chrome::AddSelectedTabWithURL( current_browser(), extension_->GetResourceURL("empty.html"), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); function->set_extension(extension_); function->SetRenderViewHost(tab->GetRenderViewHost()); } diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc index 40f349a2..9c18248 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc @@ -99,7 +99,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, TestOpenPopup) { new_browser = chrome::FindBrowserWithWebContents( browser()->OpenURL(content::OpenURLParams( GURL("about:"), content::Referrer(), NEW_WINDOW, - content::PAGE_TRANSITION_TYPED, false))); + ui::PAGE_TRANSITION_TYPED, false))); #if defined(OS_WIN) // Hide all the buttons to test that it opens even when browser action is // in the overflow bucket. @@ -339,7 +339,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, Browser* new_browser = chrome::FindBrowserWithWebContents( browser()->OpenURL(content::OpenURLParams( GURL("about:"), content::Referrer(), NEW_WINDOW, - content::PAGE_TRANSITION_TYPED, false))); + ui::PAGE_TRANSITION_TYPED, false))); // Forcibly closing the browser HWND should not cause a crash. EXPECT_EQ(TRUE, ::CloseWindow(hwnd)); diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc index 381dacd..dfedb0d 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc @@ -86,38 +86,38 @@ scoped_ptr<VisitItem> GetVisitItem(const history::VisitRow& row) { visit_item->referring_visit_id = base::Int64ToString(row.referring_visit); VisitItem::Transition transition = VisitItem::TRANSITION_LINK; - switch (row.transition & content::PAGE_TRANSITION_CORE_MASK) { - case content::PAGE_TRANSITION_LINK: + switch (row.transition & ui::PAGE_TRANSITION_CORE_MASK) { + case ui::PAGE_TRANSITION_LINK: transition = VisitItem::TRANSITION_LINK; break; - case content::PAGE_TRANSITION_TYPED: + case ui::PAGE_TRANSITION_TYPED: transition = VisitItem::TRANSITION_TYPED; break; - case content::PAGE_TRANSITION_AUTO_BOOKMARK: + case ui::PAGE_TRANSITION_AUTO_BOOKMARK: transition = VisitItem::TRANSITION_AUTO_BOOKMARK; break; - case content::PAGE_TRANSITION_AUTO_SUBFRAME: + case ui::PAGE_TRANSITION_AUTO_SUBFRAME: transition = VisitItem::TRANSITION_AUTO_SUBFRAME; break; - case content::PAGE_TRANSITION_MANUAL_SUBFRAME: + case ui::PAGE_TRANSITION_MANUAL_SUBFRAME: transition = VisitItem::TRANSITION_MANUAL_SUBFRAME; break; - case content::PAGE_TRANSITION_GENERATED: + case ui::PAGE_TRANSITION_GENERATED: transition = VisitItem::TRANSITION_GENERATED; break; - case content::PAGE_TRANSITION_AUTO_TOPLEVEL: + case ui::PAGE_TRANSITION_AUTO_TOPLEVEL: transition = VisitItem::TRANSITION_AUTO_TOPLEVEL; break; - case content::PAGE_TRANSITION_FORM_SUBMIT: + case ui::PAGE_TRANSITION_FORM_SUBMIT: transition = VisitItem::TRANSITION_FORM_SUBMIT; break; - case content::PAGE_TRANSITION_RELOAD: + case ui::PAGE_TRANSITION_RELOAD: transition = VisitItem::TRANSITION_RELOAD; break; - case content::PAGE_TRANSITION_KEYWORD: + case ui::PAGE_TRANSITION_KEYWORD: transition = VisitItem::TRANSITION_KEYWORD; break; - case content::PAGE_TRANSITION_KEYWORD_GENERATED: + case ui::PAGE_TRANSITION_KEYWORD_GENERATED: transition = VisitItem::TRANSITION_KEYWORD_GENERATED; break; default: diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc index 9ab0684..2142e8f 100644 --- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc +++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc @@ -174,7 +174,7 @@ void ChromeRuntimeAPIDelegate::OpenURL(const GURL& uninstall_url) { new Browser(Browser::CreateParams(profile, chrome::GetActiveDesktop())); chrome::NavigateParams params( - browser, uninstall_url, content::PAGE_TRANSITION_CLIENT_REDIRECT); + browser, uninstall_url, ui::PAGE_TRANSITION_CLIENT_REDIRECT); params.disposition = NEW_FOREGROUND_TAB; params.user_gesture = false; chrome::Navigate(¶ms); diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc index 8bc8145..3714c2b 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc @@ -118,7 +118,7 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_GetUserMediaTest) { content::OpenURLParams params(GURL("about:blank"), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); content::WebContents* web_contents = browser()->OpenURL(params); content::RenderFrameHost* const main_frame = web_contents->GetMainFrame(); @@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_ActiveTabPermission) { EXPECT_TRUE(before_open_tab.WaitUntilSatisfied()); content::OpenURLParams params(GURL("http://google.com"), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); content::WebContents* web_contents = browser()->OpenURL(params); before_open_tab.Reply(""); @@ -207,7 +207,7 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_FullscreenEvents) { content::OpenURLParams params(GURL("chrome://version"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); content::WebContents* web_contents = browser()->OpenURL(params); ExtensionTestMessageListener listeners_setup("ready1", true); @@ -252,7 +252,7 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_GrantForChromePages) { // Open a tab on a chrome:// page and make sure we can capture. content::OpenURLParams params(GURL("chrome://version"), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); content::WebContents* web_contents = browser()->OpenURL(params); const Extension* extension = ExtensionRegistry::Get( web_contents->GetBrowserContext())->enabled_extensions().GetByID( diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc index 93d8e5e..346b688 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc @@ -197,7 +197,7 @@ void AshPanelContents::LoadContents(int32 creator_process_id) { host_, Profile::FromBrowserContext(host_->browser_context()))); web_contents_->GetController().LoadURL( - url_, content::Referrer(), content::PAGE_TRANSITION_LINK, + url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); } diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 6fc19f7..2f2ce6c 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -559,7 +559,7 @@ bool WindowsCreateFunction::RunSync() { for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i) { WebContents* tab = chrome::AddSelectedTabWithURL( - new_window, *i, content::PAGE_TRANSITION_LINK); + new_window, *i, ui::PAGE_TRANSITION_LINK); if (create_panel) { TabHelper::FromWebContents(tab)->SetExtensionAppIconById(extension_id); } @@ -1250,7 +1250,7 @@ bool TabsUpdateFunction::UpdateURL(const std::string &url_string, } web_contents_->GetController().LoadURL( - url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); + url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); // The URL of a tab contents never actually changes to a JavaScript URL, so // this check only makes sense in other cases. @@ -1466,7 +1466,7 @@ bool TabsReloadFunction::RunSync() { // This does as same as Browser::ReloadInternal. NavigationEntry* entry = web_contents->GetController().GetVisibleEntry(); OpenURLParams params(entry->GetURL(), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_RELOAD, false); + ui::PAGE_TRANSITION_RELOAD, false); GetCurrentBrowser()->OpenURL(params); } else if (bypass_cache) { web_contents->GetController().ReloadIgnoringCache(true); diff --git a/chrome/browser/extensions/api/tabs/tabs_interactive_test.cc b/chrome/browser/extensions/api/tabs/tabs_interactive_test.cc index 674ffbd..98d9aa7 100644 --- a/chrome/browser/extensions/api/tabs/tabs_interactive_test.cc +++ b/chrome/browser/extensions/api/tabs/tabs_interactive_test.cc @@ -83,7 +83,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DISABLED_QueryLastFocusedWindowTabs) { content::RunAllPendingInMessageLoop(); GURL url; - AddTabAtIndexToBrowser(focused_window, 0, url, content::PAGE_TRANSITION_LINK); + AddTabAtIndexToBrowser(focused_window, 0, url, ui::PAGE_TRANSITION_LINK); int focused_window_id = extensions::ExtensionTabUtil::GetWindowId(focused_window); diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc index 38b0431..f890355 100644 --- a/chrome/browser/extensions/api/tabs/tabs_test.cc +++ b/chrome/browser/extensions/api/tabs/tabs_test.cc @@ -398,7 +398,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, QueryCurrentWindowTabs) { CreateBrowser(browser()->profile()); GURL url(url::kAboutBlankURL); - AddTabAtIndexToBrowser(browser(), 0, url, content::PAGE_TRANSITION_LINK); + AddTabAtIndexToBrowser(browser(), 0, url, ui::PAGE_TRANSITION_LINK); int window_id = ExtensionTabUtil::GetWindowId(browser()); // Get tabs in the 'current' window called from non-focused browser. @@ -517,7 +517,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DuplicateTab) { content::OpenURLParams params(GURL(url::kAboutBlankURL), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); content::WebContents* web_contents = browser()->OpenURL(params); int tab_id = ExtensionTabUtil::GetTabId(web_contents); @@ -561,7 +561,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DuplicateTabNoPermission) { content::OpenURLParams params(GURL(url::kAboutBlankURL), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); content::WebContents* web_contents = browser()->OpenURL(params); int tab_id = ExtensionTabUtil::GetTabId(web_contents); @@ -767,7 +767,7 @@ content::OpenURLParams GetOpenParams(const char* url) { return content::OpenURLParams(GURL(url), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); } diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index ec17b8a..24a4de3 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -367,7 +367,7 @@ void WebNavigationTabObserver::DidStartProvisionalLoadForFrame( void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { content::RenderViewHost* render_view_host = render_frame_host->GetRenderViewHost(); DVLOG(2) << "DidCommitProvisionalLoad(" @@ -423,8 +423,8 @@ void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame( transition_type); } else { if (navigation_state_.GetIsServerRedirected(render_frame_host)) { - transition_type = static_cast<content::PageTransition>( - transition_type | content::PAGE_TRANSITION_SERVER_REDIRECT); + transition_type = ui::PageTransitionFromInt( + transition_type | ui::PAGE_TRANSITION_SERVER_REDIRECT); } helpers::DispatchOnCommitted(web_navigation::OnCommitted::kEventName, web_contents(), @@ -575,7 +575,7 @@ void WebNavigationTabObserver::DidOpenRequestedURL( const GURL& url, const content::Referrer& referrer, WindowOpenDisposition disposition, - content::PageTransition transition, + ui::PageTransition transition, int64 source_frame_num) { content::RenderFrameHost* render_frame_host = content::RenderFrameHost::FromID(render_view_host_->GetProcess()->GetID(), diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h index 0df3d7c..241387d 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h @@ -66,7 +66,7 @@ class WebNavigationTabObserver virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; virtual void DidFailProvisionalLoad( content::RenderFrameHost* render_frame_host, const GURL& validated_url, @@ -87,7 +87,7 @@ class WebNavigationTabObserver const GURL& url, const content::Referrer& referrer, WindowOpenDisposition disposition, - content::PageTransition transition, + ui::PageTransition transition, int64 source_frame_num) OVERRIDE; virtual void WebContentsDestroyed() OVERRIDE; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc index c9266a7..e9e90fa 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc @@ -18,10 +18,10 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "extensions/browser/event_router.h" #include "extensions/common/event_filtering_info.h" #include "net/base/net_errors.h" +#include "ui/base/page_transition_types.h" namespace extensions { @@ -93,7 +93,7 @@ void DispatchOnCommitted(const std::string& event_name, content::WebContents* web_contents, content::RenderFrameHost* frame_host, const GURL& url, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { scoped_ptr<base::ListValue> args(new base::ListValue()); base::DictionaryValue* dict = new base::DictionaryValue(); dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents)); @@ -101,21 +101,21 @@ void DispatchOnCommitted(const std::string& event_name, dict->SetInteger(keys::kProcessIdKey, frame_host->GetProcess()->GetID()); dict->SetInteger(keys::kFrameIdKey, GetFrameId(frame_host)); std::string transition_type_string = - content::PageTransitionGetCoreTransitionString(transition_type); + ui::PageTransitionGetCoreTransitionString(transition_type); // For webNavigation API backward compatibility, keep "start_page" even after // renamed to "auto_toplevel". - if (PageTransitionStripQualifier(transition_type) == - content::PAGE_TRANSITION_AUTO_TOPLEVEL) + if (ui::PageTransitionStripQualifier(transition_type) == + ui::PAGE_TRANSITION_AUTO_TOPLEVEL) transition_type_string = "start_page"; dict->SetString(keys::kTransitionTypeKey, transition_type_string); base::ListValue* qualifiers = new base::ListValue(); - if (transition_type & content::PAGE_TRANSITION_CLIENT_REDIRECT) + if (transition_type & ui::PAGE_TRANSITION_CLIENT_REDIRECT) qualifiers->Append(new base::StringValue("client_redirect")); - if (transition_type & content::PAGE_TRANSITION_SERVER_REDIRECT) + if (transition_type & ui::PAGE_TRANSITION_SERVER_REDIRECT) qualifiers->Append(new base::StringValue("server_redirect")); - if (transition_type & content::PAGE_TRANSITION_FORWARD_BACK) + if (transition_type & ui::PAGE_TRANSITION_FORWARD_BACK) qualifiers->Append(new base::StringValue("forward_back")); - if (transition_type & content::PAGE_TRANSITION_FROM_ADDRESS_BAR) + if (transition_type & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) qualifiers->Append(new base::StringValue("from_address_bar")); dict->Set(keys::kTransitionQualifiersKey, qualifiers); dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now())); diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h index 50c30e1..ab7890a 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" namespace content { class BrowserContext; @@ -36,7 +36,7 @@ void DispatchOnCommitted(const std::string& event_name, content::WebContents* web_contents, content::RenderFrameHost* frame_host, const GURL& url, - content::PageTransition transition_type); + ui::PageTransition transition_type); void DispatchOnDOMContentLoaded(content::WebContents* web_contents, content::RenderFrameHost* frame_host, diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index efc9a12..ef63165 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -192,7 +192,7 @@ class DelayLoadStartAndExecuteJavascript virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE { + ui::PageTransition transition_type) OVERRIDE { if (script_was_executed_ && EndsWith(url.spec(), until_url_suffix_, true)) { content::WebContentsObserver::Observe(NULL); test_navigation_listener_->ResumeAll(); @@ -484,7 +484,7 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, TargetBlank) { GURL url = embedded_test_server()->GetURL( "/extensions/api_test/webnavigation/targetBlank/a.html"); - chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); + chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK); ui_test_utils::NavigateToURL(¶ms); // There's a link with target=_blank on a.html. Click on it to open it in a diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 62eebda..887285e 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -38,7 +38,6 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "extensions/browser/extension_function_dispatcher.h" #include "extensions/browser/extension_prefs.h" diff --git a/chrome/browser/extensions/chrome_ui_overrides_browsertest.cc b/chrome/browser/extensions/chrome_ui_overrides_browsertest.cc index 079b0a5..66fde53 100644 --- a/chrome/browser/extensions/chrome_ui_overrides_browsertest.cc +++ b/chrome/browser/extensions/chrome_ui_overrides_browsertest.cc @@ -22,6 +22,6 @@ IN_PROC_BROWSER_TEST_F(ChromeUIOverridesBrowserTest, AddTabAtIndex(1, GURL(chrome::kChromeUINewTabURL), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_BOOKMARK_ALL_TABS)); } diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc index 489b95e..4cd57f3 100644 --- a/chrome/browser/extensions/content_verifier_browsertest.cc +++ b/chrome/browser/extensions/content_verifier_browsertest.cc @@ -121,7 +121,7 @@ class ContentVerifierTest : public ExtensionBrowserTest { } virtual void OpenPageAndWaitForUnload() { - AddTabAtIndex(1, page_url_, content::PAGE_TRANSITION_LINK); + AddTabAtIndex(1, page_url_, ui::PAGE_TRANSITION_LINK); unload_observer_->WaitForUnload(id_); ExtensionPrefs* prefs = ExtensionPrefs::Get(profile()); int reasons = prefs->GetDisableReasons(id_); diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index fd45c24..9ccabe9 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -187,7 +187,7 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id, case NAME: { OpenURLParams params(extensions::ManifestURL::GetHomepageURL(extension), Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); browser_->OpenURL(params); break; } diff --git a/chrome/browser/extensions/extension_loading_browsertest.cc b/chrome/browser/extensions/extension_loading_browsertest.cc index dc22e84..6f98393 100644 --- a/chrome/browser/extensions/extension_loading_browsertest.cc +++ b/chrome/browser/extensions/extension_loading_browsertest.cc @@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionLoadingTest, // to crash, so open a new tab to wait long enough. AddTabAtIndex(browser()->tab_strip_model()->count(), GURL("http://www.google.com/"), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); // Check that the extension hasn't crashed. ExtensionRegistry* registry = ExtensionRegistry::Get(profile()); diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc index 1917156..4c23702 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller.cc @@ -130,7 +130,7 @@ void ExtensionMessageBubbleController::OnLinkClicked() { content::OpenURLParams(delegate_->GetLearnMoreUrl(), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); } AcknowledgeExtensions(); diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index 46ca9f3..3d38e4f 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -233,7 +233,7 @@ base::DictionaryValue* ExtensionTabUtil::OpenTab( if (pinned) add_types |= TabStripModel::ADD_PINNED; chrome::NavigateParams navigate_params( - browser, url, content::PAGE_TRANSITION_LINK); + browser, url, ui::PAGE_TRANSITION_LINK); navigate_params.disposition = active ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; navigate_params.tabstrip_index = index; @@ -610,7 +610,7 @@ void ExtensionTabUtil::OpenOptionsPage(const Extension* extension, content::OpenURLParams params(OptionsPageInfo::GetOptionsPage(extension), content::Referrer(), SINGLETON_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); browser->OpenURL(params); browser->window()->Show(); diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index d75eaae..166b8a8 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -26,7 +26,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/common/bindings_policy.h" -#include "content/public/common/page_transition_types.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/image_loader.h" #include "extensions/common/extension.h" @@ -36,6 +35,7 @@ #include "extensions/common/manifest_handlers/incognito_info.h" #include "net/base/file_stream.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/page_transition_types.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/favicon_size.h" #include "ui/gfx/image/image_skia.h" @@ -81,7 +81,7 @@ void UnregisterAndReplaceOverrideForWebContents(const std::string& page, // NavigationController has. web_contents->GetController().LoadURL( url, content::Referrer(url, blink::WebReferrerPolicyDefault), - content::PAGE_TRANSITION_RELOAD, std::string()); + ui::PAGE_TRANSITION_RELOAD, std::string()); } // Run favicon callbck with image result. If no favicon was available then @@ -170,7 +170,7 @@ ExtensionWebUI::ExtensionWebUI(content::WebUI* web_ui, const GURL& url) new extensions::BookmarkManagerPrivateDragEventRouter( profile, web_ui->GetWebContents())); - web_ui->SetLinkTransitionType(content::PAGE_TRANSITION_AUTO_BOOKMARK); + web_ui->SetLinkTransitionType(ui::PAGE_TRANSITION_AUTO_BOOKMARK); } } diff --git a/chrome/browser/extensions/webstore_inline_installer.cc b/chrome/browser/extensions/webstore_inline_installer.cc index fcdce7c..2d58fad 100644 --- a/chrome/browser/extensions/webstore_inline_installer.cc +++ b/chrome/browser/extensions/webstore_inline_installer.cc @@ -99,7 +99,7 @@ bool WebstoreInlineInstaller::CheckInlineInstallPermitted( GURL(redirect_url), content::Referrer(web_contents()->GetURL(), blink::WebReferrerPolicyDefault), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK, false)); + NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_AUTO_BOOKMARK, false)); *error = kInlineInstallSupportedError; return false; } diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 313923a..cb55a62 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -219,11 +219,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PopupBlockingHostedApp) { .ReplaceComponents(replace_host); browser()->OpenURL(OpenURLParams( - open_tab, Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED, + open_tab, Referrer(), NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false)); browser()->OpenURL(OpenURLParams( open_popup, Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); EXPECT_TRUE(WaitForTabsAndPopups(browser(), 3, 1, 0)); } diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc index ee63eca..8d2e30e 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc @@ -218,7 +218,7 @@ void GeolocationPermissionContextTests::AddNewTab(const GURL& url) { content::WebContents* new_tab = content::WebContents::Create( content::WebContents::CreateParams(profile())); new_tab->GetController().LoadURL( - url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); + url, content::Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); content::RenderViewHostTester::For(new_tab->GetRenderViewHost())-> SendNavigate(extra_tabs_.size() + 1, url); diff --git a/chrome/browser/google/google_search_counter.cc b/chrome/browser/google/google_search_counter.cc index 56ec4a6..9f4cced 100644 --- a/chrome/browser/google/google_search_counter.cc +++ b/chrome/browser/google/google_search_counter.cc @@ -30,8 +30,8 @@ GoogleSearchCounter::GetGoogleSearchAccessPointForSearchNavEntry( // If the |entry| is FROM_ADDRESS_BAR, it comes from the omnibox; if it's // GENERATED, the user was doing a search, rather than doing a navigation to a // search URL (e.g. from hisotry, or pasted in). - if (entry.GetTransitionType() == (content::PAGE_TRANSITION_GENERATED | - content::PAGE_TRANSITION_FROM_ADDRESS_BAR)) { + if (entry.GetTransitionType() == (ui::PAGE_TRANSITION_GENERATED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)) { return GoogleSearchMetrics::AP_OMNIBOX; } diff --git a/chrome/browser/google/google_search_counter_android_unittest.cc b/chrome/browser/google/google_search_counter_android_unittest.cc index dfd2c58..865c471 100644 --- a/chrome/browser/google/google_search_counter_android_unittest.cc +++ b/chrome/browser/google/google_search_counter_android_unittest.cc @@ -95,9 +95,9 @@ void GoogleSearchCounterAndroidTest::TestGoogleSearch( scoped_ptr<content::NavigationEntry> entry( content::NavigationEntry::Create()); if (is_omnibox) { - entry->SetTransitionType(content::PageTransitionFromInt( - content::PAGE_TRANSITION_GENERATED | - content::PAGE_TRANSITION_FROM_ADDRESS_BAR)); + entry->SetTransitionType(ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_GENERATED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)); } entry->SetURL(GURL(url)); details.entry = entry.get(); diff --git a/chrome/browser/google/google_search_counter_unittest.cc b/chrome/browser/google/google_search_counter_unittest.cc index df8731c..faee2ef 100644 --- a/chrome/browser/google/google_search_counter_unittest.cc +++ b/chrome/browser/google/google_search_counter_unittest.cc @@ -76,9 +76,9 @@ void GoogleSearchCounterTest::TestGoogleSearch( scoped_ptr<content::NavigationEntry> entry( content::NavigationEntry::Create()); if (is_omnibox) { - entry->SetTransitionType(content::PageTransitionFromInt( - content::PAGE_TRANSITION_GENERATED | - content::PAGE_TRANSITION_FROM_ADDRESS_BAR)); + entry->SetTransitionType(ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_GENERATED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)); } entry->SetURL(GURL(url)); details.entry = entry.get(); diff --git a/chrome/browser/google/google_url_tracker_navigation_helper_impl.cc b/chrome/browser/google/google_url_tracker_navigation_helper_impl.cc index b61d027..080f611 100644 --- a/chrome/browser/google/google_url_tracker_navigation_helper_impl.cc +++ b/chrome/browser/google/google_url_tracker_navigation_helper_impl.cc @@ -72,8 +72,8 @@ void GoogleURLTrackerNavigationHelperImpl::OpenURL( GURL url, WindowOpenDisposition disposition, bool user_clicked_on_link) { - content::PageTransition transition_type = user_clicked_on_link ? - content::PAGE_TRANSITION_LINK : content::PAGE_TRANSITION_GENERATED; + ui::PageTransition transition_type = user_clicked_on_link ? + ui::PAGE_TRANSITION_LINK : ui::PAGE_TRANSITION_GENERATED; web_contents_->OpenURL(content::OpenURLParams( url, content::Referrer(), disposition, transition_type, false)); } diff --git a/chrome/browser/gpu/three_d_api_observer.cc b/chrome/browser/gpu/three_d_api_observer.cc index 13f5eff..0f92631 100644 --- a/chrome/browser/gpu/three_d_api_observer.cc +++ b/chrome/browser/gpu/three_d_api_observer.cc @@ -150,7 +150,7 @@ bool ThreeDAPIInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { GURL("https://support.google.com/chrome/?p=ib_webgl"), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } diff --git a/chrome/browser/history/android/android_provider_backend.cc b/chrome/browser/history/android/android_provider_backend.cc index 7fc745b..bfb9019 100644 --- a/chrome/browser/history/android/android_provider_backend.cc +++ b/chrome/browser/history/android/android_provider_backend.cc @@ -17,7 +17,6 @@ #include "chrome/browser/history/thumbnail_database.h" #include "components/history/core/browser/history_client.h" #include "components/history/core/browser/keyword_search_term.h" -#include "content/public/common/page_transition_types.h" #include "sql/connection.h" diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc index e1c8d76..efc8ecc 100644 --- a/chrome/browser/history/android/android_provider_backend_unittest.cc +++ b/chrome/browser/history/android/android_provider_backend_unittest.cc @@ -224,20 +224,20 @@ TEST_F(AndroidProviderBackendTest, UpdateTables) { std::vector<VisitInfo> visits1; Time last_visited1 = Time::Now() - TimeDelta::FromDays(1); Time created1 = last_visited1 - TimeDelta::FromDays(20); - visits1.push_back(VisitInfo(created1, content::PAGE_TRANSITION_LINK)); + visits1.push_back(VisitInfo(created1, ui::PAGE_TRANSITION_LINK)); visits1.push_back(VisitInfo(last_visited1 - TimeDelta::FromDays(1), - content::PAGE_TRANSITION_LINK)); - visits1.push_back(VisitInfo(last_visited1, content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); + visits1.push_back(VisitInfo(last_visited1, ui::PAGE_TRANSITION_LINK)); GURL url2("http://www.example.com"); URLID url_id2 = 0; std::vector<VisitInfo> visits2; Time last_visited2 = Time::Now(); Time created2 = last_visited2 - TimeDelta::FromDays(10); - visits2.push_back(VisitInfo(created2, content::PAGE_TRANSITION_LINK)); + visits2.push_back(VisitInfo(created2, ui::PAGE_TRANSITION_LINK)); visits2.push_back(VisitInfo(last_visited2 - TimeDelta::FromDays(5), - content::PAGE_TRANSITION_LINK)); - visits2.push_back(VisitInfo(last_visited2, content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); + visits2.push_back(VisitInfo(last_visited2, ui::PAGE_TRANSITION_LINK)); // Add a bookmark which is not in the history. GURL url3("http://www.bookmark.com"); @@ -366,20 +366,20 @@ TEST_F(AndroidProviderBackendTest, QueryHistoryAndBookmarks) { std::vector<VisitInfo> visits1; Time last_visited1 = Time::Now() - TimeDelta::FromDays(1); Time created1 = last_visited1 - TimeDelta::FromDays(20); - visits1.push_back(VisitInfo(created1, content::PAGE_TRANSITION_LINK)); + visits1.push_back(VisitInfo(created1, ui::PAGE_TRANSITION_LINK)); visits1.push_back(VisitInfo(last_visited1 - TimeDelta::FromDays(1), - content::PAGE_TRANSITION_LINK)); - visits1.push_back(VisitInfo(last_visited1, content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); + visits1.push_back(VisitInfo(last_visited1, ui::PAGE_TRANSITION_LINK)); GURL url2("http://www.example.com"); std::vector<VisitInfo> visits2; const base::string16 title2(UTF8ToUTF16("example")); Time last_visited2 = Time::Now(); Time created2 = last_visited2 - TimeDelta::FromDays(10); - visits2.push_back(VisitInfo(created2, content::PAGE_TRANSITION_LINK)); + visits2.push_back(VisitInfo(created2, ui::PAGE_TRANSITION_LINK)); visits2.push_back(VisitInfo(last_visited2 - TimeDelta::FromDays(5), - content::PAGE_TRANSITION_LINK)); - visits2.push_back(VisitInfo(last_visited2, content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); + visits2.push_back(VisitInfo(last_visited2, ui::PAGE_TRANSITION_LINK)); // Only use the HistoryBackend to generate the test data. // HistoryBackend will shutdown after that. @@ -1802,20 +1802,20 @@ TEST_F(AndroidProviderBackendTest, QueryWithoutThumbnailDB) { std::vector<VisitInfo> visits1; Time last_visited1 = Time::Now() - TimeDelta::FromDays(1); Time created1 = last_visited1 - TimeDelta::FromDays(20); - visits1.push_back(VisitInfo(created1, content::PAGE_TRANSITION_LINK)); + visits1.push_back(VisitInfo(created1, ui::PAGE_TRANSITION_LINK)); visits1.push_back(VisitInfo(last_visited1 - TimeDelta::FromDays(1), - content::PAGE_TRANSITION_LINK)); - visits1.push_back(VisitInfo(last_visited1, content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); + visits1.push_back(VisitInfo(last_visited1, ui::PAGE_TRANSITION_LINK)); GURL url2("http://www.example.com"); std::vector<VisitInfo> visits2; const base::string16 title2(UTF8ToUTF16("example")); Time last_visited2 = Time::Now(); Time created2 = last_visited2 - TimeDelta::FromDays(10); - visits2.push_back(VisitInfo(created2, content::PAGE_TRANSITION_LINK)); + visits2.push_back(VisitInfo(created2, ui::PAGE_TRANSITION_LINK)); visits2.push_back(VisitInfo(last_visited2 - TimeDelta::FromDays(5), - content::PAGE_TRANSITION_LINK)); - visits2.push_back(VisitInfo(last_visited2, content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); + visits2.push_back(VisitInfo(last_visited2, ui::PAGE_TRANSITION_LINK)); // Only use the HistoryBackend to generate the test data. // HistoryBackend will shutdown after that. diff --git a/chrome/browser/history/android/visit_sql_handler.cc b/chrome/browser/history/android/visit_sql_handler.cc index fe9c1e5..29be69f 100644 --- a/chrome/browser/history/android/visit_sql_handler.cc +++ b/chrome/browser/history/android/visit_sql_handler.cc @@ -113,10 +113,10 @@ bool VisitSQLHandler::Delete(const TableIDRows& ids_set) { } bool VisitSQLHandler::AddVisit(URLID url_id, const Time& visit_time) { - // TODO : Is 'content::PAGE_TRANSITION_AUTO_BOOKMARK' proper? - // if not, a new content::PageTransition type will need. + // TODO : Is 'ui::PAGE_TRANSITION_AUTO_BOOKMARK' proper? + // if not, a new ui::PageTransition type will need. VisitRow visit_row(url_id, visit_time, 0, - content::PAGE_TRANSITION_AUTO_BOOKMARK, 0); + ui::PAGE_TRANSITION_AUTO_BOOKMARK, 0); return history_db_->AddVisit(&visit_row, SOURCE_BROWSED); } diff --git a/chrome/browser/history/expire_history_backend.cc b/chrome/browser/history/expire_history_backend.cc index 58eace8..7c6de26 100644 --- a/chrome/browser/history/expire_history_backend.cc +++ b/chrome/browser/history/expire_history_backend.cc @@ -86,7 +86,7 @@ class AutoSubframeVisitsReader : public ExpiringVisitsReader { db->GetVisitsInRangeForTransition(begin_time, early_end_time, max_visits, - content::PAGE_TRANSITION_AUTO_SUBFRAME, + ui::PAGE_TRANSITION_AUTO_SUBFRAME, visits); bool more = static_cast<int>(visits->size()) == max_visits; if (!more) @@ -399,13 +399,13 @@ void ExpireHistoryBackend::ExpireURLsForVisits(const VisitVector& visits, // TODO(pkasting): http://b/1148304 We shouldn't be marking so many URLs as // typed, which would help eliminate the need for this code (we still would // need to handle RELOAD transitions specially, though). - content::PageTransition transition = - content::PageTransitionStripQualifier(visits[i].transition); - if (transition != content::PAGE_TRANSITION_RELOAD) + ui::PageTransition transition = + ui::PageTransitionStripQualifier(visits[i].transition); + if (transition != ui::PAGE_TRANSITION_RELOAD) cur.visit_count++; - if ((transition == content::PAGE_TRANSITION_TYPED && - !content::PageTransitionIsRedirect(visits[i].transition)) || - transition == content::PAGE_TRANSITION_KEYWORD_GENERATED) + if ((transition == ui::PAGE_TRANSITION_TYPED && + !ui::PageTransitionIsRedirect(visits[i].transition)) || + transition == ui::PAGE_TRANSITION_KEYWORD_GENERATED) cur.typed_count++; } diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 3253369..9542dbc 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -236,7 +236,7 @@ void ExpireHistoryTest::AddExampleData(URLID url_ids[3], Time visit_times[4]) { VisitRow visit_row3; visit_row3.url_id = url_ids[1]; visit_row3.visit_time = visit_times[2]; - visit_row3.transition = content::PAGE_TRANSITION_TYPED; + visit_row3.transition = ui::PAGE_TRANSITION_TYPED; main_db_->AddVisit(&visit_row3, SOURCE_BROWSED); VisitRow visit_row4; @@ -259,19 +259,19 @@ void ExpireHistoryTest::AddExampleSourceData(const GURL& url, URLID* id) { // Four times for each visit. VisitRow visit_row1(url_id, last_visit_time - TimeDelta::FromDays(4), 0, - content::PAGE_TRANSITION_TYPED, 0); + ui::PAGE_TRANSITION_TYPED, 0); main_db_->AddVisit(&visit_row1, SOURCE_SYNCED); VisitRow visit_row2(url_id, last_visit_time - TimeDelta::FromDays(3), 0, - content::PAGE_TRANSITION_TYPED, 0); + ui::PAGE_TRANSITION_TYPED, 0); main_db_->AddVisit(&visit_row2, SOURCE_BROWSED); VisitRow visit_row3(url_id, last_visit_time - TimeDelta::FromDays(2), 0, - content::PAGE_TRANSITION_TYPED, 0); + ui::PAGE_TRANSITION_TYPED, 0); main_db_->AddVisit(&visit_row3, SOURCE_EXTENSION); VisitRow visit_row4( - url_id, last_visit_time, 0, content::PAGE_TRANSITION_TYPED, 0); + url_id, last_visit_time, 0, ui::PAGE_TRANSITION_TYPED, 0); main_db_->AddVisit(&visit_row4, SOURCE_FIREFOX_IMPORTED); } diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index 1ab3a55..7c7dcf2 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -322,18 +322,18 @@ SegmentID HistoryBackend::UpdateSegments( const GURL& url, VisitID from_visit, VisitID visit_id, - content::PageTransition transition_type, + ui::PageTransition transition_type, const Time ts) { if (!db_) return 0; // We only consider main frames. - if (!content::PageTransitionIsMainFrame(transition_type)) + if (!ui::PageTransitionIsMainFrame(transition_type)) return 0; SegmentID segment_id = 0; - content::PageTransition t = - content::PageTransitionStripQualifier(transition_type); + ui::PageTransition t = + ui::PageTransitionStripQualifier(transition_type); // Are we at the beginning of a new segment? // Note that navigating to an existing entry (with back/forward) reuses the @@ -348,9 +348,9 @@ SegmentID HistoryBackend::UpdateSegments( // Note also that we should still be updating the visit count for that segment // which we are not doing now. It should be addressed when // http://crbug.com/96860 is fixed. - if ((t == content::PAGE_TRANSITION_TYPED || - t == content::PAGE_TRANSITION_AUTO_BOOKMARK) && - (transition_type & content::PAGE_TRANSITION_FORWARD_BACK) == 0) { + if ((t == ui::PAGE_TRANSITION_TYPED || + t == ui::PAGE_TRANSITION_AUTO_BOOKMARK) && + (transition_type & ui::PAGE_TRANSITION_FORWARD_BACK) == 0) { // If so, create or get the segment. std::string segment_name = db_->ComputeSegmentName(url); URLID url_id = db_->GetRowForURL(url, NULL); @@ -437,18 +437,18 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { if (request.time < first_recorded_time_) first_recorded_time_ = request.time; - content::PageTransition request_transition = request.transition; - content::PageTransition stripped_transition = - content::PageTransitionStripQualifier(request_transition); + ui::PageTransition request_transition = request.transition; + ui::PageTransition stripped_transition = + ui::PageTransitionStripQualifier(request_transition); bool is_keyword_generated = - (stripped_transition == content::PAGE_TRANSITION_KEYWORD_GENERATED); + (stripped_transition == ui::PAGE_TRANSITION_KEYWORD_GENERATED); // If the user is navigating to a not-previously-typed intranet hostname, // change the transition to TYPED so that the omnibox will learn that this is // a known host. bool has_redirects = request.redirects.size() > 1; - if (content::PageTransitionIsMainFrame(request_transition) && - (stripped_transition != content::PAGE_TRANSITION_TYPED) && + if (ui::PageTransitionIsMainFrame(request_transition) && + (stripped_transition != ui::PAGE_TRANSITION_TYPED) && !is_keyword_generated) { const GURL& origin_url(has_redirects ? request.redirects[0] : request.url); @@ -462,21 +462,21 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); if (registry_length == 0 && !db_->IsTypedHost(host)) { - stripped_transition = content::PAGE_TRANSITION_TYPED; + stripped_transition = ui::PAGE_TRANSITION_TYPED; request_transition = - content::PageTransitionFromInt( + ui::PageTransitionFromInt( stripped_transition | - content::PageTransitionGetQualifier(request_transition)); + ui::PageTransitionGetQualifier(request_transition)); } } } if (!has_redirects) { // The single entry is both a chain start and end. - content::PageTransition t = content::PageTransitionFromInt( + ui::PageTransition t = ui::PageTransitionFromInt( request_transition | - content::PAGE_TRANSITION_CHAIN_START | - content::PAGE_TRANSITION_CHAIN_END); + ui::PAGE_TRANSITION_CHAIN_START | + ui::PAGE_TRANSITION_CHAIN_END); // No redirect case (one element means just the page itself). last_ids = AddPageVisit(request.url, request.time, @@ -495,8 +495,8 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { } else { // Redirect case. Add the redirect chain. - content::PageTransition redirect_info = - content::PAGE_TRANSITION_CHAIN_START; + ui::PageTransition redirect_info = + ui::PAGE_TRANSITION_CHAIN_START; RedirectList redirects = request.redirects; if (redirects[0].SchemeIs(url::kAboutScheme)) { @@ -510,8 +510,8 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { // In this case, we just don't bother hooking up the source of the // redirects, so we remove it. redirects.erase(redirects.begin()); - } else if (request_transition & content::PAGE_TRANSITION_CLIENT_REDIRECT) { - redirect_info = content::PAGE_TRANSITION_CLIENT_REDIRECT; + } else if (request_transition & ui::PAGE_TRANSITION_CLIENT_REDIRECT) { + redirect_info = ui::PAGE_TRANSITION_CLIENT_REDIRECT; // The first entry in the redirect chain initiated a client redirect. // We don't add this to the database since the referrer is already // there, so we skip over it but change the transition type of the first @@ -532,9 +532,9 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { VisitRow visit_row; if (request.did_replace_entry && db_->GetRowForVisit(last_ids.second, &visit_row) && - visit_row.transition & content::PAGE_TRANSITION_CHAIN_END) { - visit_row.transition = content::PageTransitionFromInt( - visit_row.transition & ~content::PAGE_TRANSITION_CHAIN_END); + visit_row.transition & ui::PAGE_TRANSITION_CHAIN_END) { + visit_row.transition = ui::PageTransitionFromInt( + visit_row.transition & ~ui::PAGE_TRANSITION_CHAIN_END); db_->UpdateVisitRow(visit_row); } } @@ -542,13 +542,13 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { for (size_t redirect_index = 0; redirect_index < redirects.size(); redirect_index++) { - content::PageTransition t = - content::PageTransitionFromInt(stripped_transition | redirect_info); + ui::PageTransition t = + ui::PageTransitionFromInt(stripped_transition | redirect_info); // If this is the last transition, add a CHAIN_END marker if (redirect_index == (redirects.size() - 1)) { - t = content::PageTransitionFromInt( - t | content::PAGE_TRANSITION_CHAIN_END); + t = ui::PageTransitionFromInt( + t | ui::PAGE_TRANSITION_CHAIN_END); } // Record all redirect visits with the same timestamp. We don't display @@ -557,7 +557,7 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { last_ids = AddPageVisit(redirects[redirect_index], request.time, last_ids.second, t, request.visit_source); - if (t & content::PAGE_TRANSITION_CHAIN_START) { + if (t & ui::PAGE_TRANSITION_CHAIN_START) { // Update the segment for this visit. UpdateSegments(redirects[redirect_index], from_visit_id, last_ids.second, t, request.time); @@ -568,7 +568,7 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { // Subsequent transitions in the redirect list must all be server // redirects. - redirect_info = content::PAGE_TRANSITION_SERVER_REDIRECT; + redirect_info = ui::PAGE_TRANSITION_SERVER_REDIRECT; } // Last, save this redirect chain for later so we can set titles & favicons @@ -583,8 +583,8 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { // TODO(evanm): Due to http://b/1194536 we lose the referrers of a subframe // navigation anyway, so last_visit_id is always zero for them. But adding // them here confuses main frame history, so we skip them for now. - if (stripped_transition != content::PAGE_TRANSITION_AUTO_SUBFRAME && - stripped_transition != content::PAGE_TRANSITION_MANUAL_SUBFRAME && + if (stripped_transition != ui::PAGE_TRANSITION_AUTO_SUBFRAME && + stripped_transition != ui::PAGE_TRANSITION_MANUAL_SUBFRAME && !is_keyword_generated) { tracker_.AddVisit(request.context_id, request.page_id, request.url, last_ids.second); @@ -734,28 +734,28 @@ std::pair<URLID, VisitID> HistoryBackend::AddPageVisit( const GURL& url, Time time, VisitID referring_visit, - content::PageTransition transition, + ui::PageTransition transition, VisitSource visit_source) { // Top-level frame navigations are visible, everything else is hidden - bool new_hidden = !content::PageTransitionIsMainFrame(transition); + bool new_hidden = !ui::PageTransitionIsMainFrame(transition); // NOTE: This code must stay in sync with // ExpireHistoryBackend::ExpireURLsForVisits(). // TODO(pkasting): http://b/1148304 We shouldn't be marking so many URLs as // typed, which would eliminate the need for this code. int typed_increment = 0; - content::PageTransition transition_type = - content::PageTransitionStripQualifier(transition); - if ((transition_type == content::PAGE_TRANSITION_TYPED && - !content::PageTransitionIsRedirect(transition)) || - transition_type == content::PAGE_TRANSITION_KEYWORD_GENERATED) + ui::PageTransition transition_type = + ui::PageTransitionStripQualifier(transition); + if ((transition_type == ui::PAGE_TRANSITION_TYPED && + !ui::PageTransitionIsRedirect(transition)) || + transition_type == ui::PAGE_TRANSITION_KEYWORD_GENERATED) typed_increment = 1; #if defined(OS_ANDROID) // Only count the page visit if it came from user browsing and only count it // once when cycling through a redirect chain. if (visit_source == SOURCE_BROWSED && - (transition & content::PAGE_TRANSITION_CHAIN_END) != 0) { + (transition & ui::PAGE_TRANSITION_CHAIN_END) != 0) { RecordTopPageVisitStats(url); } #endif @@ -765,8 +765,8 @@ std::pair<URLID, VisitID> HistoryBackend::AddPageVisit( URLID url_id = db_->GetRowForURL(url, &url_info); if (url_id) { // Update of an existing row. - if (content::PageTransitionStripQualifier(transition) != - content::PAGE_TRANSITION_RELOAD) + if (ui::PageTransitionStripQualifier(transition) != + ui::PAGE_TRANSITION_RELOAD) url_info.set_visit_count(url_info.visit_count() + 1); if (typed_increment) url_info.set_typed_count(url_info.typed_count() + typed_increment); @@ -854,10 +854,10 @@ void HistoryBackend::AddPagesWithDetails(const URLRows& urls, if (visit_source != SOURCE_SYNCED) { // Make up a visit to correspond to the last visit to the page. VisitRow visit_info(url_id, i->last_visit(), 0, - content::PageTransitionFromInt( - content::PAGE_TRANSITION_LINK | - content::PAGE_TRANSITION_CHAIN_START | - content::PAGE_TRANSITION_CHAIN_END), 0); + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_LINK | + ui::PAGE_TRANSITION_CHAIN_START | + ui::PAGE_TRANSITION_CHAIN_END), 0); if (!db_->AddVisit(&visit_info, visit_source)) { NOTREACHED() << "Adding visit failed."; return; @@ -1253,7 +1253,7 @@ void HistoryBackend::QueryHistoryBasic(const QueryOptions& options, // Set whether the visit was blocked for a managed user by looking at the // transition type. url_result.set_blocked_visit( - (visit.transition & content::PAGE_TRANSITION_BLOCKED) != 0); + (visit.transition & ui::PAGE_TRANSITION_BLOCKED) != 0); // We don't set any of the query-specific parts of the URLResult, since // snippets and stuff don't apply to basic querying. diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h index 21d864b..293595c 100644 --- a/chrome/browser/history/history_backend.h +++ b/chrome/browser/history/history_backend.h @@ -613,7 +613,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, std::pair<URLID, VisitID> AddPageVisit(const GURL& url, base::Time time, VisitID referring_visit, - content::PageTransition transition, + ui::PageTransition transition, VisitSource visit_source); // Returns a redirect chain in |redirects| for the VisitID @@ -672,7 +672,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, SegmentID UpdateSegments(const GURL& url, VisitID from_visit, VisitID visit_id, - content::PageTransition transition_type, + ui::PageTransition transition_type, const base::Time ts); // Favicons ------------------------------------------------------------------ diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index 91091a7..15b6b70 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -232,14 +232,14 @@ class HistoryBackendTest : public HistoryBackendTestBase { protected: void AddRedirectChain(const char* sequence[], int page_id) { AddRedirectChainWithTransitionAndTime(sequence, page_id, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, Time::Now()); } void AddRedirectChainWithTransitionAndTime( const char* sequence[], int page_id, - content::PageTransition transition, + ui::PageTransition transition, base::Time time) { history::RedirectList redirects; for (int i = 0; sequence[i] != NULL; ++i) @@ -271,7 +271,7 @@ class HistoryBackendTest : public HistoryBackendTestBase { redirects.push_back(url2); HistoryAddPageArgs request( url2, time, dummy_context_id, 0, url1, - redirects, content::PAGE_TRANSITION_CLIENT_REDIRECT, + redirects, ui::PAGE_TRANSITION_CLIENT_REDIRECT, history::SOURCE_BROWSED, did_replace); backend_->AddPage(request); @@ -628,7 +628,7 @@ TEST_F(HistoryBackendTest, DeleteAllThenAddData) { GURL url("http://www.google.com/"); HistoryAddPageArgs request(url, visit_time, NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_KEYWORD_GENERATED, + ui::PAGE_TRANSITION_KEYWORD_GENERATED, history::SOURCE_BROWSED, false); backend_->AddPage(request); @@ -771,7 +771,7 @@ TEST_F(HistoryBackendTest, KeywordGenerated) { Time visit_time = Time::Now() - base::TimeDelta::FromDays(1); HistoryAddPageArgs request(url, visit_time, NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_KEYWORD_GENERATED, + ui::PAGE_TRANSITION_KEYWORD_GENERATED, history::SOURCE_BROWSED, false); backend_->AddPage(request); @@ -823,21 +823,21 @@ TEST_F(HistoryBackendTest, ClientRedirect) { GURL url_a("http://google.com/a"); AddClientRedirect(GURL(), url_a, false, base::Time(), &transition1, &transition2); - EXPECT_TRUE(transition2 & content::PAGE_TRANSITION_CHAIN_END); + EXPECT_TRUE(transition2 & ui::PAGE_TRANSITION_CHAIN_END); // User initiated redirect to page B. GURL url_b("http://google.com/b"); AddClientRedirect(url_a, url_b, false, base::Time(), &transition1, &transition2); - EXPECT_TRUE(transition1 & content::PAGE_TRANSITION_CHAIN_END); - EXPECT_TRUE(transition2 & content::PAGE_TRANSITION_CHAIN_END); + EXPECT_TRUE(transition1 & ui::PAGE_TRANSITION_CHAIN_END); + EXPECT_TRUE(transition2 & ui::PAGE_TRANSITION_CHAIN_END); // Non-user initiated redirect to page C. GURL url_c("http://google.com/c"); AddClientRedirect(url_b, url_c, true, base::Time(), &transition1, &transition2); - EXPECT_FALSE(transition1 & content::PAGE_TRANSITION_CHAIN_END); - EXPECT_TRUE(transition2 & content::PAGE_TRANSITION_CHAIN_END); + EXPECT_FALSE(transition1 & ui::PAGE_TRANSITION_CHAIN_END); + EXPECT_TRUE(transition2 & ui::PAGE_TRANSITION_CHAIN_END); } TEST_F(HistoryBackendTest, AddPagesWithDetails) { @@ -1106,8 +1106,8 @@ TEST_F(HistoryBackendTest, StripUsernamePasswordTest) { // Visit the url with username, password. backend_->AddPageVisit(url, base::Time::Now(), 0, - content::PageTransitionFromInt( - content::PageTransitionGetQualifier(content::PAGE_TRANSITION_TYPED)), + ui::PageTransitionFromInt( + ui::PageTransitionGetQualifier(ui::PAGE_TRANSITION_TYPED)), history::SOURCE_BROWSED); // Fetch the row information about stripped url from history db. @@ -1129,15 +1129,15 @@ TEST_F(HistoryBackendTest, AddPageVisitSource) { // Assume visiting the url from an externsion. backend_->AddPageVisit( - url, base::Time::Now(), 0, content::PAGE_TRANSITION_TYPED, + url, base::Time::Now(), 0, ui::PAGE_TRANSITION_TYPED, history::SOURCE_EXTENSION); // Assume the url is imported from Firefox. backend_->AddPageVisit(url, base::Time::Now(), 0, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_FIREFOX_IMPORTED); // Assume this url is also synced. backend_->AddPageVisit(url, base::Time::Now(), 0, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_SYNCED); // Fetch the row information about the url from history db. @@ -1183,15 +1183,15 @@ TEST_F(HistoryBackendTest, AddPageVisitNotLastVisit) { // Visit the url with recent time. backend_->AddPageVisit(url, recent_time, 0, - content::PageTransitionFromInt( - content::PageTransitionGetQualifier(content::PAGE_TRANSITION_TYPED)), + ui::PageTransitionFromInt( + ui::PageTransitionGetQualifier(ui::PAGE_TRANSITION_TYPED)), history::SOURCE_BROWSED); // Add to the url a visit with older time (could be syncing from another // client, etc.). backend_->AddPageVisit(url, older_time, 0, - content::PageTransitionFromInt( - content::PageTransitionGetQualifier(content::PAGE_TRANSITION_TYPED)), + ui::PageTransitionFromInt( + ui::PageTransitionGetQualifier(ui::PAGE_TRANSITION_TYPED)), history::SOURCE_SYNCED); // Fetch the row information about url from history db. @@ -1218,11 +1218,11 @@ TEST_F(HistoryBackendTest, AddPageVisitFiresNotificationWithCorrectDetails) { // Visit two distinct URLs, the second one twice. backend_->AddPageVisit(url1, base::Time::Now(), 0, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED); for (int i = 0; i < 2; ++i) { backend_->AddPageVisit(url2, base::Time::Now(), 0, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED); } @@ -1237,8 +1237,8 @@ TEST_F(HistoryBackendTest, AddPageVisitFiresNotificationWithCorrectDetails) { broadcasted_notifications()[0].first); const URLVisitedDetails* details = static_cast<const URLVisitedDetails*>( broadcasted_notifications()[0].second); - EXPECT_EQ(content::PAGE_TRANSITION_LINK, - content::PageTransitionStripQualifier(details->transition)); + EXPECT_EQ(ui::PAGE_TRANSITION_LINK, + ui::PageTransitionStripQualifier(details->transition)); EXPECT_EQ(stored_row1.id(), details->row.id()); EXPECT_EQ(stored_row1.url(), details->row.url()); @@ -1250,8 +1250,8 @@ TEST_F(HistoryBackendTest, AddPageVisitFiresNotificationWithCorrectDetails) { broadcasted_notifications()[2].first); details = static_cast<const URLVisitedDetails*>( broadcasted_notifications()[2].second); - EXPECT_EQ(content::PAGE_TRANSITION_TYPED, - content::PageTransitionStripQualifier(details->transition)); + EXPECT_EQ(ui::PAGE_TRANSITION_TYPED, + ui::PageTransitionStripQualifier(details->transition)); EXPECT_EQ(stored_row2.id(), details->row.id()); EXPECT_EQ(stored_row2.url(), details->row.url()); } @@ -1264,19 +1264,19 @@ TEST_F(HistoryBackendTest, AddPageArgsSource) { // Assume this page is browsed by user. HistoryAddPageArgs request1(url, base::Time::Now(), NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_KEYWORD_GENERATED, + ui::PAGE_TRANSITION_KEYWORD_GENERATED, history::SOURCE_BROWSED, false); backend_->AddPage(request1); // Assume this page is synced. HistoryAddPageArgs request2(url, base::Time::Now(), NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, history::SOURCE_SYNCED, false); backend_->AddPage(request2); // Assume this page is browsed again. HistoryAddPageArgs request3(url, base::Time::Now(), NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); backend_->AddPage(request3); @@ -1299,18 +1299,18 @@ TEST_F(HistoryBackendTest, AddVisitsSource) { std::vector<VisitInfo> visits1, visits2; visits1.push_back(VisitInfo( Time::Now() - base::TimeDelta::FromDays(5), - content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); visits1.push_back(VisitInfo( Time::Now() - base::TimeDelta::FromDays(1), - content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); visits1.push_back(VisitInfo( - Time::Now(), content::PAGE_TRANSITION_LINK)); + Time::Now(), ui::PAGE_TRANSITION_LINK)); GURL url2("http://www.example.com"); visits2.push_back(VisitInfo( Time::Now() - base::TimeDelta::FromDays(10), - content::PAGE_TRANSITION_LINK)); - visits2.push_back(VisitInfo(Time::Now(), content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); + visits2.push_back(VisitInfo(Time::Now(), ui::PAGE_TRANSITION_LINK)); // Clear all history. backend_->DeleteAllHistory(); @@ -1346,12 +1346,12 @@ TEST_F(HistoryBackendTest, GetMostRecentVisits) { std::vector<VisitInfo> visits1; visits1.push_back(VisitInfo( Time::Now() - base::TimeDelta::FromDays(5), - content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); visits1.push_back(VisitInfo( Time::Now() - base::TimeDelta::FromDays(1), - content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); visits1.push_back(VisitInfo( - Time::Now(), content::PAGE_TRANSITION_LINK)); + Time::Now(), ui::PAGE_TRANSITION_LINK)); // Clear all history. backend_->DeleteAllHistory(); @@ -1377,13 +1377,13 @@ TEST_F(HistoryBackendTest, RemoveVisitsTransitions) { GURL url1("http://www.cnn.com"); VisitInfo typed_visit( Time::Now() - base::TimeDelta::FromDays(6), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); VisitInfo reload_visit( Time::Now() - base::TimeDelta::FromDays(5), - content::PAGE_TRANSITION_RELOAD); + ui::PAGE_TRANSITION_RELOAD); VisitInfo link_visit( Time::Now() - base::TimeDelta::FromDays(4), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); std::vector<VisitInfo> visits_to_add; visits_to_add.push_back(typed_visit); visits_to_add.push_back(reload_visit); @@ -1430,15 +1430,15 @@ TEST_F(HistoryBackendTest, RemoveVisitsSource) { std::vector<VisitInfo> visits1, visits2; visits1.push_back(VisitInfo( Time::Now() - base::TimeDelta::FromDays(5), - content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); visits1.push_back(VisitInfo(Time::Now(), - content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); GURL url2("http://www.example.com"); visits2.push_back(VisitInfo( Time::Now() - base::TimeDelta::FromDays(10), - content::PAGE_TRANSITION_LINK)); - visits2.push_back(VisitInfo(Time::Now(), content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); + visits2.push_back(VisitInfo(Time::Now(), ui::PAGE_TRANSITION_LINK)); // Clear all history. backend_->DeleteAllHistory(); @@ -2543,10 +2543,10 @@ TEST_F(HistoryBackendTest, QueryFilteredURLs) { base::TimeDelta one_hour = base::TimeDelta::FromHours(1); base::TimeDelta one_day = base::TimeDelta::FromDays(1); - const content::PageTransition kTypedTransition = - content::PAGE_TRANSITION_TYPED; - const content::PageTransition kKeywordGeneratedTransition = - content::PAGE_TRANSITION_KEYWORD_GENERATED; + const ui::PageTransition kTypedTransition = + ui::PAGE_TRANSITION_TYPED; + const ui::PageTransition kKeywordGeneratedTransition = + ui::PAGE_TRANSITION_KEYWORD_GENERATED; const char* redirect_sequence[2]; redirect_sequence[1] = NULL; @@ -2682,11 +2682,11 @@ TEST_F(HistoryBackendTest, UpdateVisitDuration) { std::vector<VisitInfo> visit_info1, visit_info2; Time start_ts = Time::Now() - base::TimeDelta::FromDays(5); Time end_ts = start_ts + base::TimeDelta::FromDays(2); - visit_info1.push_back(VisitInfo(start_ts, content::PAGE_TRANSITION_LINK)); + visit_info1.push_back(VisitInfo(start_ts, ui::PAGE_TRANSITION_LINK)); GURL url2("http://www.example.com"); visit_info2.push_back(VisitInfo(Time::Now() - base::TimeDelta::FromDays(10), - content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); // Clear all history. backend_->DeleteAllHistory(); @@ -2972,7 +2972,7 @@ TEST_F(HistoryBackendTest, RemoveNotification) { service->AddPage( url, base::Time::Now(), NULL, 1, GURL(), RedirectList(), - content::PAGE_TRANSITION_TYPED, SOURCE_BROWSED, false); + ui::PAGE_TRANSITION_TYPED, SOURCE_BROWSED, false); // This won't actually delete the URL, rather it'll empty out the visits. // This triggers blocking on the BookmarkModel. diff --git a/chrome/browser/history/history_notifications.cc b/chrome/browser/history/history_notifications.cc index 86c859f..2f30a3b 100644 --- a/chrome/browser/history/history_notifications.cc +++ b/chrome/browser/history/history_notifications.cc @@ -7,7 +7,7 @@ namespace history { URLVisitedDetails::URLVisitedDetails() - : transition(content::PAGE_TRANSITION_LINK) {} + : transition(ui::PAGE_TRANSITION_LINK) {} URLVisitedDetails::~URLVisitedDetails() {} diff --git a/chrome/browser/history/history_notifications.h b/chrome/browser/history/history_notifications.h index 2eb4fa7..3386b2f 100644 --- a/chrome/browser/history/history_notifications.h +++ b/chrome/browser/history/history_notifications.h @@ -21,7 +21,7 @@ struct URLVisitedDetails : public HistoryDetails { URLVisitedDetails(); virtual ~URLVisitedDetails(); - content::PageTransition transition; + ui::PageTransition transition; // The affected URLRow. The ID will be set to the value that is currently in // effect in the main history database. diff --git a/chrome/browser/history/history_querying_unittest.cc b/chrome/browser/history/history_querying_unittest.cc index d5b1c04..b7a9b25 100644 --- a/chrome/browser/history/history_querying_unittest.cc +++ b/chrome/browser/history/history_querying_unittest.cc @@ -154,7 +154,7 @@ class HistoryQueryTest : public testing::Test { GURL url(entry.url); history_->AddPage(url, entry.time, context_id, page_id_++, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_LINK, + history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); history_->SetPageTitle(url, base::UTF8ToUTF16(entry.title)); } diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc index fd4c2d9..4c61734 100644 --- a/chrome/browser/history/history_service.cc +++ b/chrome/browser/history/history_service.cc @@ -370,7 +370,7 @@ void HistoryService::AddPage(const GURL& url, int32 page_id, const GURL& referrer, const history::RedirectList& redirects, - content::PageTransition transition, + ui::PageTransition transition, history::VisitSource visit_source, bool did_replace_entry) { DCHECK(thread_checker_.CalledOnValidThread()); @@ -387,7 +387,7 @@ void HistoryService::AddPage(const GURL& url, AddPage( history::HistoryAddPageArgs(url, time, NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, visit_source, false)); } diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h index 9be45da..a7de0cb 100644 --- a/chrome/browser/history/history_service.h +++ b/chrome/browser/history/history_service.h @@ -33,9 +33,9 @@ #include "content/public/browser/download_manager_delegate.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "content/public/common/page_transition_types.h" #include "sql/init_status.h" #include "sync/api/syncable_service.h" +#include "ui/base/page_transition_types.h" #if defined(OS_ANDROID) class AndroidHistoryProviderService; @@ -182,7 +182,7 @@ class HistoryService : public content::NotificationObserver, int32 page_id, const GURL& referrer, const history::RedirectList& redirects, - content::PageTransition transition, + ui::PageTransition transition, history::VisitSource visit_source, bool did_replace_entry); diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc index 370594e..f0f7960 100644 --- a/chrome/browser/history/history_tab_helper.cc +++ b/chrome/browser/history/history_tab_helper.cc @@ -61,7 +61,7 @@ HistoryTabHelper::CreateHistoryAddPageArgs( params.url, timestamp, web_contents(), params.page_id, params.referrer.url, params.redirects, params.transition, history::SOURCE_BROWSED, did_replace_entry); - if (content::PageTransitionIsMainFrame(params.transition) && + if (ui::PageTransitionIsMainFrame(params.transition) && virtual_url != params.url) { // Hack on the "virtual" URL so that it will appear in history. For some // types of URLs, we will display a magic URL that is different from where diff --git a/chrome/browser/history/history_types.cc b/chrome/browser/history/history_types.cc index 97145ec..5e733cc 100644 --- a/chrome/browser/history/history_types.cc +++ b/chrome/browser/history/history_types.cc @@ -17,14 +17,14 @@ VisitRow::VisitRow() : visit_id(0), url_id(0), referring_visit(0), - transition(content::PAGE_TRANSITION_LINK), + transition(ui::PAGE_TRANSITION_LINK), segment_id(0) { } VisitRow::VisitRow(URLID arg_url_id, base::Time arg_visit_time, VisitID arg_referring_visit, - content::PageTransition arg_transition, + ui::PageTransition arg_transition, SegmentID arg_segment_id) : visit_id(0), url_id(arg_url_id), @@ -50,7 +50,7 @@ QueryURLResult::~QueryURLResult() { HistoryAddPageArgs::HistoryAddPageArgs() : context_id(NULL), page_id(0), - transition(content::PAGE_TRANSITION_LINK), + transition(ui::PAGE_TRANSITION_LINK), visit_source(SOURCE_BROWSED), did_replace_entry(false) {} @@ -61,7 +61,7 @@ HistoryAddPageArgs::HistoryAddPageArgs( int32 page_id, const GURL& referrer, const history::RedirectList& redirects, - content::PageTransition transition, + ui::PageTransition transition, VisitSource source, bool did_replace_entry) : url(url), diff --git a/chrome/browser/history/history_types.h b/chrome/browser/history/history_types.h index 70946bf..c50856b 100644 --- a/chrome/browser/history/history_types.h +++ b/chrome/browser/history/history_types.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_HISTORY_HISTORY_TYPES_H_ #include "components/history/core/browser/history_types.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" namespace content { class WebContents; @@ -30,7 +30,7 @@ class VisitRow { VisitRow(URLID arg_url_id, base::Time arg_visit_time, VisitID arg_referring_visit, - content::PageTransition arg_transition, + ui::PageTransition arg_transition, SegmentID arg_segment_id); ~VisitRow(); @@ -47,7 +47,7 @@ class VisitRow { VisitID referring_visit; // A combination of bits from PageTransition. - content::PageTransition transition; + ui::PageTransition transition; // The segment id (see visitsegment_database.*). // If 0, the segment id is null in the table. @@ -72,7 +72,7 @@ typedef std::vector<VisitRow> VisitVector; // The basic information associated with a visit (timestamp, type of visit), // used by HistoryBackend::AddVisits() to create new visits for a URL. -typedef std::pair<base::Time, content::PageTransition> VisitInfo; +typedef std::pair<base::Time, ui::PageTransition> VisitInfo; // QueryURLResult ------------------------------------------------------------- @@ -96,7 +96,7 @@ struct HistoryAddPageArgs { // // HistoryAddPageArgs( // GURL(), base::Time(), NULL, 0, GURL(), - // history::RedirectList(), content::PAGE_TRANSITION_LINK, + // history::RedirectList(), ui::PAGE_TRANSITION_LINK, // SOURCE_BROWSED, false) HistoryAddPageArgs(); HistoryAddPageArgs(const GURL& url, @@ -105,7 +105,7 @@ struct HistoryAddPageArgs { int32 page_id, const GURL& referrer, const history::RedirectList& redirects, - content::PageTransition transition, + ui::PageTransition transition, VisitSource source, bool did_replace_entry); ~HistoryAddPageArgs(); @@ -118,7 +118,7 @@ struct HistoryAddPageArgs { GURL referrer; history::RedirectList redirects; - content::PageTransition transition; + ui::PageTransition transition; VisitSource visit_source; bool did_replace_entry; }; @@ -127,7 +127,7 @@ struct HistoryAddPageArgs { struct BriefVisitInfo { URLID url_id; base::Time time; - content::PageTransition transition; + ui::PageTransition transition; }; // An observer of VisitDatabase. diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 13b6aa1..a4fdf6b 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -1119,7 +1119,7 @@ TEST_F(HistoryTest, AddPage) { const GURL test_url("http://www.google.com/"); history_service_->AddPage(test_url, base::Time::Now(), NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_MANUAL_SUBFRAME, + ui::PAGE_TRANSITION_MANUAL_SUBFRAME, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url)); EXPECT_EQ(1, query_url_row_.visit_count()); @@ -1128,7 +1128,7 @@ TEST_F(HistoryTest, AddPage) { // Add the page once from the main frame (should unhide it). history_service_->AddPage(test_url, base::Time::Now(), NULL, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_LINK, + history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url)); EXPECT_EQ(2, query_url_row_.visit_count()); // Added twice. @@ -1151,7 +1151,7 @@ TEST_F(HistoryTest, AddRedirect) { history_service_->AddPage( first_redirects.back(), base::Time::Now(), reinterpret_cast<ContextID>(1), 0, GURL(), first_redirects, - content::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, true); + ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, true); // The first page should be added once with a link visit type (because we set // LINK when we added the original URL, and a referrer of nowhere (0). @@ -1159,8 +1159,8 @@ TEST_F(HistoryTest, AddRedirect) { EXPECT_EQ(1, query_url_row_.visit_count()); ASSERT_EQ(1U, query_url_visits_.size()); int64 first_visit = query_url_visits_[0].visit_id; - EXPECT_EQ(content::PAGE_TRANSITION_LINK | - content::PAGE_TRANSITION_CHAIN_START, + EXPECT_EQ(ui::PAGE_TRANSITION_LINK | + ui::PAGE_TRANSITION_CHAIN_START, query_url_visits_[0].transition); EXPECT_EQ(0, query_url_visits_[0].referring_visit); // No referrer. @@ -1170,8 +1170,8 @@ TEST_F(HistoryTest, AddRedirect) { EXPECT_EQ(1, query_url_row_.visit_count()); ASSERT_EQ(1U, query_url_visits_.size()); int64 second_visit = query_url_visits_[0].visit_id; - EXPECT_EQ(content::PAGE_TRANSITION_SERVER_REDIRECT | - content::PAGE_TRANSITION_CHAIN_END, + EXPECT_EQ(ui::PAGE_TRANSITION_SERVER_REDIRECT | + ui::PAGE_TRANSITION_CHAIN_END, query_url_visits_[0].transition); EXPECT_EQ(first_visit, query_url_visits_[0].referring_visit); @@ -1190,9 +1190,9 @@ TEST_F(HistoryTest, AddRedirect) { history_service_->AddPage(second_redirects[1], base::Time::Now(), reinterpret_cast<ContextID>(1), 1, second_redirects[0], second_redirects, - static_cast<content::PageTransition>( - content::PAGE_TRANSITION_LINK | - content::PAGE_TRANSITION_CLIENT_REDIRECT), + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_LINK | + ui::PAGE_TRANSITION_CLIENT_REDIRECT), history::SOURCE_BROWSED, true); // The last page (source of the client redirect) should NOT have an @@ -1205,8 +1205,8 @@ TEST_F(HistoryTest, AddRedirect) { EXPECT_TRUE(QueryURL(history_service_.get(), second_redirects[1])); EXPECT_EQ(1, query_url_row_.visit_count()); ASSERT_EQ(1U, query_url_visits_.size()); - EXPECT_EQ(content::PAGE_TRANSITION_CLIENT_REDIRECT | - content::PAGE_TRANSITION_CHAIN_END, + EXPECT_EQ(ui::PAGE_TRANSITION_CLIENT_REDIRECT | + ui::PAGE_TRANSITION_CHAIN_END, query_url_visits_[0].transition); EXPECT_EQ(second_visit, query_url_visits_[0].referring_visit); } @@ -1219,14 +1219,14 @@ TEST_F(HistoryTest, MakeIntranetURLsTyped) { const GURL test_url("http://intranet_host/path"); history_service_->AddPage( test_url, base::Time::Now(), NULL, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_LINK, + history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url)); EXPECT_EQ(1, query_url_row_.visit_count()); EXPECT_EQ(1, query_url_row_.typed_count()); ASSERT_EQ(1U, query_url_visits_.size()); - EXPECT_EQ(content::PAGE_TRANSITION_TYPED, - content::PageTransitionStripQualifier(query_url_visits_[0].transition)); + EXPECT_EQ(ui::PAGE_TRANSITION_TYPED, + ui::PageTransitionStripQualifier(query_url_visits_[0].transition)); // Add more visits on the same host. None of these should be promoted since // there is already a typed visit. @@ -1235,66 +1235,66 @@ TEST_F(HistoryTest, MakeIntranetURLsTyped) { const GURL test_url2("http://intranet_host/different_path"); history_service_->AddPage( test_url2, base::Time::Now(), NULL, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_LINK, + history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url2)); EXPECT_EQ(1, query_url_row_.visit_count()); EXPECT_EQ(0, query_url_row_.typed_count()); ASSERT_EQ(1U, query_url_visits_.size()); - EXPECT_EQ(content::PAGE_TRANSITION_LINK, - content::PageTransitionStripQualifier(query_url_visits_[0].transition)); + EXPECT_EQ(ui::PAGE_TRANSITION_LINK, + ui::PageTransitionStripQualifier(query_url_visits_[0].transition)); // No path. const GURL test_url3("http://intranet_host/"); history_service_->AddPage( test_url3, base::Time::Now(), NULL, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_LINK, + history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url3)); EXPECT_EQ(1, query_url_row_.visit_count()); EXPECT_EQ(0, query_url_row_.typed_count()); ASSERT_EQ(1U, query_url_visits_.size()); - EXPECT_EQ(content::PAGE_TRANSITION_LINK, - content::PageTransitionStripQualifier(query_url_visits_[0].transition)); + EXPECT_EQ(ui::PAGE_TRANSITION_LINK, + ui::PageTransitionStripQualifier(query_url_visits_[0].transition)); // Different scheme. const GURL test_url4("https://intranet_host/"); history_service_->AddPage( test_url4, base::Time::Now(), NULL, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_LINK, + history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url4)); EXPECT_EQ(1, query_url_row_.visit_count()); EXPECT_EQ(0, query_url_row_.typed_count()); ASSERT_EQ(1U, query_url_visits_.size()); - EXPECT_EQ(content::PAGE_TRANSITION_LINK, - content::PageTransitionStripQualifier(query_url_visits_[0].transition)); + EXPECT_EQ(ui::PAGE_TRANSITION_LINK, + ui::PageTransitionStripQualifier(query_url_visits_[0].transition)); // Different transition. const GURL test_url5("http://intranet_host/another_path"); history_service_->AddPage( test_url5, base::Time::Now(), NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_AUTO_BOOKMARK, + ui::PAGE_TRANSITION_AUTO_BOOKMARK, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url5)); EXPECT_EQ(1, query_url_row_.visit_count()); EXPECT_EQ(0, query_url_row_.typed_count()); ASSERT_EQ(1U, query_url_visits_.size()); - EXPECT_EQ(content::PAGE_TRANSITION_AUTO_BOOKMARK, - content::PageTransitionStripQualifier(query_url_visits_[0].transition)); + EXPECT_EQ(ui::PAGE_TRANSITION_AUTO_BOOKMARK, + ui::PageTransitionStripQualifier(query_url_visits_[0].transition)); // Original URL. history_service_->AddPage( test_url, base::Time::Now(), NULL, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_LINK, + history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url)); EXPECT_EQ(2, query_url_row_.visit_count()); EXPECT_EQ(1, query_url_row_.typed_count()); ASSERT_EQ(2U, query_url_visits_.size()); - EXPECT_EQ(content::PAGE_TRANSITION_LINK, - content::PageTransitionStripQualifier(query_url_visits_[1].transition)); + EXPECT_EQ(ui::PAGE_TRANSITION_LINK, + ui::PageTransitionStripQualifier(query_url_visits_[1].transition)); } TEST_F(HistoryTest, Typed) { @@ -1306,7 +1306,7 @@ TEST_F(HistoryTest, Typed) { const GURL test_url("http://www.google.com/"); history_service_->AddPage( test_url, base::Time::Now(), context_id, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_TYPED, + history::RedirectList(), ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url)); @@ -1317,7 +1317,7 @@ TEST_F(HistoryTest, Typed) { // Add the page again not typed. history_service_->AddPage( test_url, base::Time::Now(), context_id, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_LINK, + history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url)); @@ -1328,7 +1328,7 @@ TEST_F(HistoryTest, Typed) { // Add the page again as a generated URL. history_service_->AddPage( test_url, base::Time::Now(), context_id, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_GENERATED, + history::RedirectList(), ui::PAGE_TRANSITION_GENERATED, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url)); @@ -1339,7 +1339,7 @@ TEST_F(HistoryTest, Typed) { // Add the page again as a reload. history_service_->AddPage( test_url, base::Time::Now(), context_id, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_RELOAD, + history::RedirectList(), ui::PAGE_TRANSITION_RELOAD, history::SOURCE_BROWSED, false); EXPECT_TRUE(QueryURL(history_service_.get(), test_url)); @@ -1391,11 +1391,11 @@ TEST_F(HistoryTest, MostVisitedURLs) { // Add two pages. history_service_->AddPage( url0, base::Time::Now(), context_id, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_TYPED, + history::RedirectList(), ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); history_service_->AddPage( url1, base::Time::Now(), context_id, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_TYPED, + history::RedirectList(), ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); history_service_->QueryMostVisitedURLs( 20, @@ -1412,7 +1412,7 @@ TEST_F(HistoryTest, MostVisitedURLs) { // Add another page. history_service_->AddPage( url2, base::Time::Now(), context_id, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_TYPED, + history::RedirectList(), ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); history_service_->QueryMostVisitedURLs( 20, @@ -1430,7 +1430,7 @@ TEST_F(HistoryTest, MostVisitedURLs) { // Revisit url2, making it the top URL. history_service_->AddPage( url2, base::Time::Now(), context_id, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_TYPED, + history::RedirectList(), ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); history_service_->QueryMostVisitedURLs( 20, @@ -1448,7 +1448,7 @@ TEST_F(HistoryTest, MostVisitedURLs) { // Revisit url1, making it the top URL. history_service_->AddPage( url1, base::Time::Now(), context_id, 0, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_TYPED, + history::RedirectList(), ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); history_service_->QueryMostVisitedURLs( 20, @@ -1471,7 +1471,7 @@ TEST_F(HistoryTest, MostVisitedURLs) { // Visit url4 using redirects. history_service_->AddPage( url4, base::Time::Now(), context_id, 0, GURL(), - redirects, content::PAGE_TRANSITION_TYPED, + redirects, ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); history_service_->QueryMostVisitedURLs( 20, @@ -1576,7 +1576,7 @@ TEST_F(HistoryTest, ProcessLocalDeleteDirectiveSyncOnline) { base::Time::UnixEpoch() + base::TimeDelta::FromMicroseconds(i); history_service_->AddPage(test_url, t, NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); } @@ -1641,7 +1641,7 @@ TEST_F(HistoryTest, ProcessGlobalIdDeleteDirective) { base::Time::UnixEpoch() + base::TimeDelta::FromMicroseconds(i); history_service_->AddPage(test_url, t, NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); } @@ -1732,7 +1732,7 @@ TEST_F(HistoryTest, ProcessTimeRangeDeleteDirective) { base::Time::UnixEpoch() + base::TimeDelta::FromMicroseconds(i); history_service_->AddPage(test_url, t, NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); } diff --git a/chrome/browser/history/in_memory_url_index_cache.proto b/chrome/browser/history/in_memory_url_index_cache.proto index 3a39e74..df2de1b 100644 --- a/chrome/browser/history/in_memory_url_index_cache.proto +++ b/chrome/browser/history/in_memory_url_index_cache.proto @@ -57,7 +57,7 @@ message InMemoryURLIndexCacheItem { message HistoryInfoMapEntry { message VisitInfo { required int64 visit_time = 1; - // Corresponds to content::PageTransition. + // Corresponds to ui::PageTransition. required uint64 transition_type = 2; } required int64 history_id = 1; diff --git a/chrome/browser/history/scored_history_match.cc b/chrome/browser/history/scored_history_match.cc index a5270f4..1f1184c 100644 --- a/chrome/browser/history/scored_history_match.cc +++ b/chrome/browser/history/scored_history_match.cc @@ -531,7 +531,7 @@ float ScoredHistoryMatch::GetFrequency(const base::Time& now, float summed_visit_points = 0; for (size_t i = 0; i < std::min(visits.size(), kMaxVisitsToScore); ++i) { int value_of_transition = - (visits[i].second == content::PAGE_TRANSITION_TYPED) ? 20 : 1; + (visits[i].second == ui::PAGE_TRANSITION_TYPED) ? 20 : 1; if (bookmarked) value_of_transition = std::max(value_of_transition, bookmark_value_); const float bucket_weight = diff --git a/chrome/browser/history/scored_history_match_unittest.cc b/chrome/browser/history/scored_history_match_unittest.cc index b653a9b..4989966 100644 --- a/chrome/browser/history/scored_history_match_unittest.cc +++ b/chrome/browser/history/scored_history_match_unittest.cc @@ -25,7 +25,7 @@ VisitInfoVector CreateVisitInfoVector(int num_visits, for (int i = 0; i < num_visits; ++i) { visits.push_back( std::make_pair(now - base::TimeDelta::FromDays(i * frequency), - content::PAGE_TRANSITION_LINK)); + ui::PAGE_TRANSITION_LINK)); } return visits; } @@ -122,7 +122,7 @@ TEST_F(ScoredHistoryMatchTest, Scoring) { WordStarts one_word_no_offset(1, 0u); VisitInfoVector visits_a = CreateVisitInfoVector(3, 30, now); // Mark one visit as typed. - visits_a[0].second = content::PAGE_TRANSITION_TYPED; + visits_a[0].second = ui::PAGE_TRANSITION_TYPED; ScoredHistoryMatch scored_a(row_a, visits_a, std::string(), ASCIIToUTF16("abc"), Make1Term("abc"), one_word_no_offset, word_starts_a, now, NULL); @@ -132,7 +132,7 @@ TEST_F(ScoredHistoryMatchTest, Scoring) { RowWordStarts word_starts_b; PopulateWordStarts(row_b, &word_starts_b); VisitInfoVector visits_b = CreateVisitInfoVector(10, 30, now); - visits_b[0].second = content::PAGE_TRANSITION_TYPED; + visits_b[0].second = ui::PAGE_TRANSITION_TYPED; ScoredHistoryMatch scored_b(row_b, visits_b, std::string(), ASCIIToUTF16("abc"), Make1Term("abc"), one_word_no_offset, word_starts_b, now, NULL); @@ -143,7 +143,7 @@ TEST_F(ScoredHistoryMatchTest, Scoring) { RowWordStarts word_starts_c; PopulateWordStarts(row_c, &word_starts_c); VisitInfoVector visits_c = CreateVisitInfoVector(3, 10, now); - visits_c[0].second = content::PAGE_TRANSITION_TYPED; + visits_c[0].second = ui::PAGE_TRANSITION_TYPED; ScoredHistoryMatch scored_c(row_c, visits_c, std::string(), ASCIIToUTF16("abc"), Make1Term("abc"), one_word_no_offset, word_starts_c, now, NULL); @@ -154,9 +154,9 @@ TEST_F(ScoredHistoryMatchTest, Scoring) { RowWordStarts word_starts_d; PopulateWordStarts(row_d, &word_starts_d); VisitInfoVector visits_d = CreateVisitInfoVector(3, 30, now); - visits_d[0].second = content::PAGE_TRANSITION_TYPED; - visits_d[1].second = content::PAGE_TRANSITION_TYPED; - visits_d[2].second = content::PAGE_TRANSITION_TYPED; + visits_d[0].second = ui::PAGE_TRANSITION_TYPED; + visits_d[1].second = ui::PAGE_TRANSITION_TYPED; + visits_d[2].second = ui::PAGE_TRANSITION_TYPED; ScoredHistoryMatch scored_d(row_d, visits_d, std::string(), ASCIIToUTF16("abc"), Make1Term("abc"), one_word_no_offset, word_starts_d, now, NULL); diff --git a/chrome/browser/history/shortcuts_database.cc b/chrome/browser/history/shortcuts_database.cc index 3094b58..ec4c097 100644 --- a/chrome/browser/history/shortcuts_database.cc +++ b/chrome/browser/history/shortcuts_database.cc @@ -11,10 +11,10 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "components/omnibox/autocomplete_match_type.h" -#include "content/public/common/page_transition_types.h" #include "sql/meta_table.h" #include "sql/statement.h" #include "sql/transaction.h" +#include "ui/base/page_transition_types.h" // Helpers -------------------------------------------------------------------- @@ -243,7 +243,7 @@ bool ShortcutsDatabase::EnsureTable() { "ADD COLUMN transition INTEGER") && db_.Execute(base::StringPrintf( "UPDATE omni_box_shortcuts SET transition = %d", - static_cast<int>(content::PAGE_TRANSITION_TYPED)).c_str()) && + static_cast<int>(ui::PAGE_TRANSITION_TYPED)).c_str()) && db_.Execute("ALTER TABLE omni_box_shortcuts ADD COLUMN type INTEGER") && db_.Execute(base::StringPrintf( "UPDATE omni_box_shortcuts SET type = %d", diff --git a/chrome/browser/history/shortcuts_database_unittest.cc b/chrome/browser/history/shortcuts_database_unittest.cc index 7721f76..52324c3 100644 --- a/chrome/browser/history/shortcuts_database_unittest.cc +++ b/chrome/browser/history/shortcuts_database_unittest.cc @@ -13,11 +13,10 @@ #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_profile.h" #include "components/omnibox/autocomplete_match_type.h" -#include "content/public/common/page_transition_types.h" #include "sql/statement.h" #include "sql/test/test_helpers.h" - #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" using base::ASCIIToUTF16; @@ -34,7 +33,7 @@ struct ShortcutsDatabaseTestInfo { std::string contents_class; std::string description; std::string description_class; - content::PageTransition transition; + ui::PageTransition transition; AutocompleteMatchType::Type type; std::string keyword; int days_from_now; @@ -42,17 +41,17 @@ struct ShortcutsDatabaseTestInfo { } shortcut_test_db[] = { { "BD85DBA2-8C29-49F9-84AE-48E1E90880DF", "goog", "www.google.com", "http://www.google.com/", "Google", "0,1,4,0", "Google", "0,1", - content::PAGE_TRANSITION_GENERATED, AutocompleteMatchType::SEARCH_HISTORY, + ui::PAGE_TRANSITION_GENERATED, AutocompleteMatchType::SEARCH_HISTORY, "google.com", 1, 100, }, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E0", "slash", "slashdot.org", "http://slashdot.org/", "slashdot.org", "0,1", "Slashdot - News for nerds, stuff that matters", "0,0", - content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 0, + ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 0, 100}, { "BD85DBA2-8C29-49F9-84AE-48E1E90880E1", "news", "slashdot.org", "http://slashdot.org/", "slashdot.org", "0,1", "Slashdot - News for nerds, stuff that matters", "0,0", - content::PAGE_TRANSITION_LINK, AutocompleteMatchType::HISTORY_TITLE, "", 0, + ui::PAGE_TRANSITION_LINK, AutocompleteMatchType::HISTORY_TITLE, "", 0, 5}, }; @@ -258,8 +257,8 @@ TEST(ShortcutsDatabaseMigrationTest, MigrateTableAddFillIntoEdit) { EXPECT_EQ(statement.ColumnString(1), statement.ColumnString(0)); // The other three columns have default values. - EXPECT_EQ(content::PAGE_TRANSITION_TYPED, - static_cast<content::PageTransition>(statement.ColumnInt(2))); + EXPECT_EQ(ui::PAGE_TRANSITION_TYPED, + ui::PageTransitionFromInt(statement.ColumnInt(2))); EXPECT_EQ(AutocompleteMatchType::HISTORY_TITLE, static_cast<AutocompleteMatchType::Type>(statement.ColumnInt(3))); EXPECT_TRUE(statement.ColumnString(4).empty()); diff --git a/chrome/browser/history/top_sites_impl_unittest.cc b/chrome/browser/history/top_sites_impl_unittest.cc index 9cd07aa..168aa73 100644 --- a/chrome/browser/history/top_sites_impl_unittest.cc +++ b/chrome/browser/history/top_sites_impl_unittest.cc @@ -281,7 +281,7 @@ class TopSitesImplTest : public HistoryUnitTestBase { redirects.push_back(url); history_service()->AddPage( url, base::Time::Now(), reinterpret_cast<ContextID>(1), 0, GURL(), - redirects, content::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, + redirects, ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); } @@ -291,7 +291,7 @@ class TopSitesImplTest : public HistoryUnitTestBase { redirects.push_back(url); history_service()->AddPage( url, base::Time::Now(), reinterpret_cast<ContextID>(1), 0, GURL(), - redirects, content::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, + redirects, ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); history_service()->SetPageTitle(url, title); } @@ -303,7 +303,7 @@ class TopSitesImplTest : public HistoryUnitTestBase { base::Time time) { history_service()->AddPage( url, time, reinterpret_cast<ContextID>(1), 0, GURL(), - redirects, content::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, + redirects, ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); history_service()->SetPageTitle(url, title); } diff --git a/chrome/browser/history/typed_url_syncable_service.cc b/chrome/browser/history/typed_url_syncable_service.cc index d3f8d54..57719f1 100644 --- a/chrome/browser/history/typed_url_syncable_service.cc +++ b/chrome/browser/history/typed_url_syncable_service.cc @@ -151,7 +151,7 @@ void TypedUrlSyncableService::OnUrlsModified(URLRows* changed_urls) { sync_processor_->ProcessSyncChanges(FROM_HERE, changes); } -void TypedUrlSyncableService::OnUrlVisited(content::PageTransition transition, +void TypedUrlSyncableService::OnUrlVisited(ui::PageTransition transition, URLRow* row) { DCHECK(expected_loop_ == base::MessageLoop::current()); DCHECK(row); @@ -245,13 +245,13 @@ bool TypedUrlSyncableService::ShouldIgnoreUrl(const GURL& url) { } bool TypedUrlSyncableService::ShouldSyncVisit( - content::PageTransition page_transition, + ui::PageTransition page_transition, URLRow* row) { if (!row) return false; int typed_count = row->typed_count(); - content::PageTransition transition = static_cast<content::PageTransition>( - page_transition & content::PAGE_TRANSITION_CORE_MASK); + ui::PageTransition transition = ui::PageTransitionFromInt( + page_transition & ui::PAGE_TRANSITION_CORE_MASK); // Just use an ad-hoc criteria to determine whether to ignore this // notification. For most users, the distribution of visits is roughly a bell @@ -260,7 +260,7 @@ bool TypedUrlSyncableService::ShouldSyncVisit( // suggestions. But there are relatively few URLs with > 10 visits, and those // tend to be more broadly distributed such that there's no need to sync up // every visit to preserve their relative ordering. - return (transition == content::PAGE_TRANSITION_TYPED && + return (transition == ui::PAGE_TRANSITION_TYPED && typed_count > 0 && (typed_count < kTypedUrlVisitThrottleThreshold || (typed_count % kTypedUrlVisitThrottleMultiple) == 0)); @@ -345,13 +345,13 @@ void TypedUrlSyncableService::WriteToTypedUrlSpecifics( // Walk the passed-in visit vector and count the # of typed visits. for (VisitVector::const_iterator visit = visits.begin(); visit != visits.end(); ++visit) { - content::PageTransition transition = content::PageTransitionFromInt( - visit->transition & content::PAGE_TRANSITION_CORE_MASK); + ui::PageTransition transition = ui::PageTransitionFromInt( + visit->transition & ui::PAGE_TRANSITION_CORE_MASK); // We ignore reload visits. - if (transition == content::PAGE_TRANSITION_RELOAD) + if (transition == ui::PAGE_TRANSITION_RELOAD) continue; ++total; - if (transition == content::PAGE_TRANSITION_TYPED) + if (transition == ui::PAGE_TRANSITION_TYPED) ++typed_count; } // We should have at least one typed visit. This can sometimes happen if @@ -370,20 +370,20 @@ void TypedUrlSyncableService::WriteToTypedUrlSpecifics( for (VisitVector::const_iterator visit = visits.begin(); visit != visits.end(); ++visit) { - content::PageTransition transition = content::PageTransitionFromInt( - visit->transition & content::PAGE_TRANSITION_CORE_MASK); + ui::PageTransition transition = + ui::PageTransitionStripQualifier(visit->transition); // Skip reload visits. - if (transition == content::PAGE_TRANSITION_RELOAD) + if (transition == ui::PAGE_TRANSITION_RELOAD) continue; // If we only have room for typed visits, then only add typed visits. - if (only_typed && transition != content::PAGE_TRANSITION_TYPED) + if (only_typed && transition != ui::PAGE_TRANSITION_TYPED) continue; if (skip_count > 0) { // We have too many entries to fit, so we need to skip the oldest ones. // Only skip typed URLs if there are too many typed URLs to fit. - if (only_typed || transition != content::PAGE_TRANSITION_TYPED) { + if (only_typed || transition != ui::PAGE_TRANSITION_TYPED) { --skip_count; continue; } @@ -400,7 +400,7 @@ void TypedUrlSyncableService::WriteToTypedUrlSpecifics( // it's not legal to have an empty visit array (yet another workaround // for http://crbug.com/84258). typed_url->add_visits(url.last_visit().ToInternalValue()); - typed_url->add_visit_transitions(content::PAGE_TRANSITION_RELOAD); + typed_url->add_visit_transitions(ui::PAGE_TRANSITION_RELOAD); } CHECK_GT(typed_url->visits_size(), 0); CHECK_LE(typed_url->visits_size(), kMaxTypedUrlVisits); @@ -426,7 +426,7 @@ bool TypedUrlSyncableService::FixupURLAndGetVisits( if (visits->empty()) { DVLOG(1) << "Found empty visits for URL: " << url->url(); VisitRow visit( - url->id(), url->last_visit(), 0, content::PAGE_TRANSITION_TYPED, 0); + url->id(), url->last_visit(), 0, ui::PAGE_TRANSITION_TYPED, 0); visits->push_back(visit); } diff --git a/chrome/browser/history/typed_url_syncable_service.h b/chrome/browser/history/typed_url_syncable_service.h index b696db8..c1b835f 100644 --- a/chrome/browser/history/typed_url_syncable_service.h +++ b/chrome/browser/history/typed_url_syncable_service.h @@ -10,12 +10,12 @@ #include "chrome/browser/history/history_notifications.h" #include "chrome/browser/history/history_types.h" -#include "content/public/common/page_transition_types.h" #include "sync/api/sync_change.h" #include "sync/api/sync_data.h" #include "sync/api/sync_error.h" #include "sync/api/sync_error_factory.h" #include "sync/api/syncable_service.h" +#include "ui/base/page_transition_types.h" class GURL; class TypedUrlSyncableServiceTest; @@ -57,7 +57,7 @@ class TypedUrlSyncableService : public syncer::SyncableService { // Called directly by HistoryBackend when local url data changes. void OnUrlsModified(URLRows* changed_urls); - void OnUrlVisited(content::PageTransition transition, URLRow* row); + void OnUrlVisited(ui::PageTransition transition, URLRow* row); void OnUrlsDeleted(bool all_history, bool expired, URLRows* rows); protected: @@ -86,7 +86,7 @@ class TypedUrlSyncableService : public syncer::SyncableService { // notification. We use this to throttle the number of sync changes we send // to the server so we don't hit the server for every // single typed URL visit. - bool ShouldSyncVisit(content::PageTransition transition, URLRow* row); + bool ShouldSyncVisit(ui::PageTransition transition, URLRow* row); // Utility routine that either updates an existing sync node or creates a // new one for the passed |typed_url| if one does not already exist. Returns diff --git a/chrome/browser/history/typed_url_syncable_service_unittest.cc b/chrome/browser/history/typed_url_syncable_service_unittest.cc index 5ff477d..8f3b912 100644 --- a/chrome/browser/history/typed_url_syncable_service_unittest.cc +++ b/chrome/browser/history/typed_url_syncable_service_unittest.cc @@ -103,12 +103,12 @@ class TypedUrlSyncableServiceTest : public testing::Test { static void AddNewestVisit(URLRow* url, VisitVector* visits, - content::PageTransition transition, + ui::PageTransition transition, int64 visit_time); static void AddOldestVisit(URLRow* url, VisitVector* visits, - content::PageTransition transition, + ui::PageTransition transition, int64 visit_time); static bool URLsEqual(URLRow& row, @@ -166,12 +166,12 @@ URLRow TypedUrlSyncableServiceTest::MakeTypedUrlRow( // Add a typed visit for time |last_visit|. visits->insert(first, VisitRow(history_url.id(), last_visit_time, 0, - content::PAGE_TRANSITION_TYPED, 0)); + ui::PAGE_TRANSITION_TYPED, 0)); } else { // Add a non-typed visit for time |last_visit|. visits->insert(first, VisitRow(history_url.id(), last_visit_time, 0, - content::PAGE_TRANSITION_RELOAD, 0)); + ui::PAGE_TRANSITION_RELOAD, 0)); } history_url.set_visit_count(visits->size()); @@ -181,13 +181,13 @@ URLRow TypedUrlSyncableServiceTest::MakeTypedUrlRow( void TypedUrlSyncableServiceTest::AddNewestVisit( URLRow* url, VisitVector* visits, - content::PageTransition transition, + ui::PageTransition transition, int64 visit_time) { base::Time time = base::Time::FromInternalValue(visit_time); visits->insert(visits->begin(), VisitRow(url->id(), time, 0, transition, 0)); - if (transition == content::PAGE_TRANSITION_TYPED) { + if (transition == ui::PAGE_TRANSITION_TYPED) { url->set_typed_count(url->typed_count() + 1); } @@ -198,12 +198,12 @@ void TypedUrlSyncableServiceTest::AddNewestVisit( void TypedUrlSyncableServiceTest::AddOldestVisit( URLRow* url, VisitVector* visits, - content::PageTransition transition, + ui::PageTransition transition, int64 visit_time) { base::Time time = base::Time::FromInternalValue(visit_time); visits->push_back(VisitRow(url->id(), time, 0, transition, 0)); - if (transition == content::PAGE_TRANSITION_TYPED) { + if (transition == ui::PAGE_TRANSITION_TYPED) { url->set_typed_count(url->typed_count() + 1); } @@ -311,7 +311,7 @@ TEST_F(TypedUrlSyncableServiceTest, UpdateLocalTypedUrlAndSync) { VisitVector visits = visit_vectors.front(); URLRows changed_urls; - AddNewestVisit(&url_row, &visits, content::PAGE_TRANSITION_TYPED, 7); + AddNewestVisit(&url_row, &visits, ui::PAGE_TRANSITION_TYPED, 7); static_cast<TestHistoryBackend*>(fake_history_backend_.get())-> SetVisitsForUrl(url_row.id(), &visits); changed_urls.push_back(url_row); @@ -363,11 +363,11 @@ TEST_F(TypedUrlSyncableServiceTest, LinkVisitLocalTypedUrlAndSync) { VisitVector visits = visit_vectors.front(); // Update the URL row, adding a non-typed visit to the visit vector. - AddNewestVisit(&url_row, &visits, content::PAGE_TRANSITION_LINK, 6); + AddNewestVisit(&url_row, &visits, ui::PAGE_TRANSITION_LINK, 6); static_cast<TestHistoryBackend*>(fake_history_backend_.get())-> SetVisitsForUrl(url_row.id(), &visits); - content::PageTransition transition = content::PAGE_TRANSITION_LINK; + ui::PageTransition transition = ui::PAGE_TRANSITION_LINK; // Notify typed url sync service of non-typed visit, expect no change. typed_url_sync_service_->OnUrlVisited(transition, &url_row); ASSERT_EQ(0u, changes.size()); @@ -387,14 +387,14 @@ TEST_F(TypedUrlSyncableServiceTest, TypedVisitLocalTypedUrlAndSync) { VisitVector visits = visit_vectors.front(); // Update the URL row, adding another typed visit to the visit vector. - AddOldestVisit(&url_row, &visits, content::PAGE_TRANSITION_LINK, 1); - AddNewestVisit(&url_row, &visits, content::PAGE_TRANSITION_LINK, 6); - AddNewestVisit(&url_row, &visits, content::PAGE_TRANSITION_TYPED, 7); + AddOldestVisit(&url_row, &visits, ui::PAGE_TRANSITION_LINK, 1); + AddNewestVisit(&url_row, &visits, ui::PAGE_TRANSITION_LINK, 6); + AddNewestVisit(&url_row, &visits, ui::PAGE_TRANSITION_TYPED, 7); static_cast<TestHistoryBackend*>(fake_history_backend_.get())-> SetVisitsForUrl(url_row.id(), &visits); // Notify typed url sync service of typed visit. - content::PageTransition transition = content::PAGE_TRANSITION_TYPED; + ui::PageTransition transition = ui::PAGE_TRANSITION_TYPED; typed_url_sync_service_->OnUrlVisited(transition, &url_row); ASSERT_EQ(1u, changes.size()); @@ -541,17 +541,17 @@ TEST_F(TypedUrlSyncableServiceTest, MaxVisitLocalTypedUrlAndSync) { // non-typed visits are expected to be skipped. int i = 1; for (; i <= kMaxTypedUrlVisits - 20; ++i) - AddNewestVisit(&url_row, &visits, content::PAGE_TRANSITION_TYPED, i); + AddNewestVisit(&url_row, &visits, ui::PAGE_TRANSITION_TYPED, i); for (; i <= kMaxTypedUrlVisits; ++i) - AddNewestVisit(&url_row, &visits, content::PAGE_TRANSITION_LINK, i); + AddNewestVisit(&url_row, &visits, ui::PAGE_TRANSITION_LINK, i); for (; i <= kMaxTypedUrlVisits + 10; ++i) - AddNewestVisit(&url_row, &visits, content::PAGE_TRANSITION_TYPED, i); + AddNewestVisit(&url_row, &visits, ui::PAGE_TRANSITION_TYPED, i); static_cast<TestHistoryBackend*>(fake_history_backend_.get())-> SetVisitsForUrl(url_row.id(), &visits); // Notify typed url sync service of typed visit. - content::PageTransition transition = content::PAGE_TRANSITION_TYPED; + ui::PageTransition transition = ui::PAGE_TRANSITION_TYPED; typed_url_sync_service_->OnUrlVisited(transition, &url_row); const syncer::SyncChangeList& changes = fake_change_processor_->changes(); @@ -568,7 +568,7 @@ TEST_F(TypedUrlSyncableServiceTest, MaxVisitLocalTypedUrlAndSync) { int num_other_visits_synced = 0; int r = url_specifics.visits_size() - 1; for (int i = 0; i < url_specifics.visits_size(); ++i, --r) { - if (url_specifics.visit_transitions(i) == content::PAGE_TRANSITION_TYPED) { + if (url_specifics.visit_transitions(i) == ui::PAGE_TRANSITION_TYPED) { ++num_typed_visits_synced; } else { ++num_other_visits_synced; @@ -592,13 +592,13 @@ TEST_F(TypedUrlSyncableServiceTest, ThrottleVisitLocalTypedUrlSync) { // Add enough visits to the url so that typed count is above the throttle // limit, and not right on the interval that gets synced. for (int i = 1; i < 42; ++i) - AddNewestVisit(&url_row, &visits, content::PAGE_TRANSITION_TYPED, i); + AddNewestVisit(&url_row, &visits, ui::PAGE_TRANSITION_TYPED, i); static_cast<TestHistoryBackend*>(fake_history_backend_.get())-> SetVisitsForUrl(url_row.id(), &visits); // Notify typed url sync service of typed visit. - content::PageTransition transition = content::PAGE_TRANSITION_TYPED; + ui::PageTransition transition = ui::PAGE_TRANSITION_TYPED; typed_url_sync_service_->OnUrlVisited(transition, &url_row); // Should throttle, so sync and local cache should not update. diff --git a/chrome/browser/history/url_index_private_data.cc b/chrome/browser/history/url_index_private_data.cc index 232bc1f..b2aea16 100644 --- a/chrome/browser/history/url_index_private_data.cc +++ b/chrome/browser/history/url_index_private_data.cc @@ -1182,8 +1182,7 @@ bool URLIndexPrivateData::RestoreHistoryInfoMap( for (int i = 0; i < iter->visits_size(); ++i) { visits.push_back(std::make_pair( base::Time::FromInternalValue(iter->visits(i).visit_time()), - static_cast<content::PageTransition>(iter->visits(i). - transition_type()))); + ui::PageTransitionFromInt(iter->visits(i).transition_type()))); } history_info_map_[history_id].visits = visits; } diff --git a/chrome/browser/history/visit_database.cc b/chrome/browser/history/visit_database.cc index b2a4695..9a14490 100644 --- a/chrome/browser/history/visit_database.cc +++ b/chrome/browser/history/visit_database.cc @@ -14,8 +14,8 @@ #include "chrome/browser/history/visit_filter.h" #include "chrome/common/url_constants.h" #include "components/history/core/browser/url_database.h" -#include "content/public/common/page_transition_types.h" #include "sql/statement.h" +#include "ui/base/page_transition_types.h" namespace history { @@ -87,7 +87,7 @@ void VisitDatabase::FillVisitRow(sql::Statement& statement, VisitRow* visit) { visit->url_id = statement.ColumnInt64(1); visit->visit_time = base::Time::FromInternalValue(statement.ColumnInt64(2)); visit->referring_visit = statement.ColumnInt64(3); - visit->transition = content::PageTransitionFromInt(statement.ColumnInt(4)); + visit->transition = ui::PageTransitionFromInt(statement.ColumnInt(4)); visit->segment_id = statement.ColumnInt64(5); visit->visit_duration = base::TimeDelta::FromInternalValue(statement.ColumnInt64(6)); @@ -271,11 +271,11 @@ bool VisitDatabase::GetVisibleVisitsForURL(URLID url_id, statement.BindInt64(0, url_id); statement.BindInt64(1, options.EffectiveBeginTime()); statement.BindInt64(2, options.EffectiveEndTime()); - statement.BindInt(3, content::PAGE_TRANSITION_CHAIN_END); - statement.BindInt(4, content::PAGE_TRANSITION_CORE_MASK); - statement.BindInt(5, content::PAGE_TRANSITION_AUTO_SUBFRAME); - statement.BindInt(6, content::PAGE_TRANSITION_MANUAL_SUBFRAME); - statement.BindInt(7, content::PAGE_TRANSITION_KEYWORD_GENERATED); + statement.BindInt(3, ui::PAGE_TRANSITION_CHAIN_END); + statement.BindInt(4, ui::PAGE_TRANSITION_CORE_MASK); + statement.BindInt(5, ui::PAGE_TRANSITION_AUTO_SUBFRAME); + statement.BindInt(6, ui::PAGE_TRANSITION_MANUAL_SUBFRAME); + statement.BindInt(7, ui::PAGE_TRANSITION_KEYWORD_GENERATED); return FillVisitVectorWithOptions(statement, options, visits); } @@ -323,7 +323,7 @@ bool VisitDatabase::GetVisitsInRangeForTransition( base::Time begin_time, base::Time end_time, int max_results, - content::PageTransition transition, + ui::PageTransition transition, VisitVector* visits) { DCHECK(visits); visits->clear(); @@ -338,7 +338,7 @@ bool VisitDatabase::GetVisitsInRangeForTransition( int64 end = end_time.ToInternalValue(); statement.BindInt64(0, begin_time.ToInternalValue()); statement.BindInt64(1, end ? end : std::numeric_limits<int64>::max()); - statement.BindInt(2, content::PAGE_TRANSITION_CORE_MASK); + statement.BindInt(2, ui::PAGE_TRANSITION_CORE_MASK); statement.BindInt(3, transition); statement.BindInt64(4, max_results ? max_results : std::numeric_limits<int64>::max()); @@ -361,11 +361,11 @@ bool VisitDatabase::GetVisibleVisitsInRange(const QueryOptions& options, statement.BindInt64(0, options.EffectiveBeginTime()); statement.BindInt64(1, options.EffectiveEndTime()); - statement.BindInt(2, content::PAGE_TRANSITION_CHAIN_END); - statement.BindInt(3, content::PAGE_TRANSITION_CORE_MASK); - statement.BindInt(4, content::PAGE_TRANSITION_AUTO_SUBFRAME); - statement.BindInt(5, content::PAGE_TRANSITION_MANUAL_SUBFRAME); - statement.BindInt(6, content::PAGE_TRANSITION_KEYWORD_GENERATED); + statement.BindInt(2, ui::PAGE_TRANSITION_CHAIN_END); + statement.BindInt(3, ui::PAGE_TRANSITION_CORE_MASK); + statement.BindInt(4, ui::PAGE_TRANSITION_AUTO_SUBFRAME); + statement.BindInt(5, ui::PAGE_TRANSITION_MANUAL_SUBFRAME); + statement.BindInt(6, ui::PAGE_TRANSITION_KEYWORD_GENERATED); return FillVisitVectorWithOptions(statement, options, visits); } @@ -387,10 +387,10 @@ void VisitDatabase::GetDirectVisitsDuringTimes(const VisitFilter& time_filter, statement.BindInt64(0, it->first.ToInternalValue()); statement.BindInt64(1, it->second.ToInternalValue()); - statement.BindInt(2, content::PAGE_TRANSITION_CHAIN_START); - statement.BindInt(3, content::PAGE_TRANSITION_CORE_MASK); - statement.BindInt(4, content::PAGE_TRANSITION_TYPED); - statement.BindInt(5, content::PAGE_TRANSITION_AUTO_BOOKMARK); + statement.BindInt(2, ui::PAGE_TRANSITION_CHAIN_START); + statement.BindInt(3, ui::PAGE_TRANSITION_CORE_MASK); + statement.BindInt(4, ui::PAGE_TRANSITION_TYPED); + statement.BindInt(5, ui::PAGE_TRANSITION_AUTO_BOOKMARK); while (statement.Step()) { VisitRow visit; @@ -451,7 +451,7 @@ bool VisitDatabase::GetRedirectFromVisit(VisitID from_visit, "WHERE v.from_visit = ? " "AND (v.transition & ?) != 0")); // IS_REDIRECT_MASK statement.BindInt64(0, from_visit); - statement.BindInt(1, content::PAGE_TRANSITION_IS_REDIRECT_MASK); + statement.BindInt(1, ui::PAGE_TRANSITION_IS_REDIRECT_MASK); if (!statement.Step()) return false; // No redirect from this visit. (Or SQL error) @@ -516,11 +516,11 @@ bool VisitDatabase::GetVisibleVisitCountToHost(const GURL& url, statement.BindString(0, host_query_min); statement.BindString(1, host_query_min.substr(0, host_query_min.size() - 1) + '0'); - statement.BindInt(2, content::PAGE_TRANSITION_CHAIN_END); - statement.BindInt(3, content::PAGE_TRANSITION_CORE_MASK); - statement.BindInt(4, content::PAGE_TRANSITION_AUTO_SUBFRAME); - statement.BindInt(5, content::PAGE_TRANSITION_MANUAL_SUBFRAME); - statement.BindInt(6, content::PAGE_TRANSITION_KEYWORD_GENERATED); + statement.BindInt(2, ui::PAGE_TRANSITION_CHAIN_END); + statement.BindInt(3, ui::PAGE_TRANSITION_CORE_MASK); + statement.BindInt(4, ui::PAGE_TRANSITION_AUTO_SUBFRAME); + statement.BindInt(5, ui::PAGE_TRANSITION_MANUAL_SUBFRAME); + statement.BindInt(6, ui::PAGE_TRANSITION_KEYWORD_GENERATED); if (!statement.Step()) { // We've never been to this page before. @@ -617,7 +617,7 @@ void VisitDatabase::GetBriefVisitInfoOfMostRecentVisits( BriefVisitInfo info; info.url_id = statement.ColumnInt64(0); info.time = base::Time::FromInternalValue(statement.ColumnInt64(1)); - info.transition = content::PageTransitionFromInt(statement.ColumnInt(2)); + info.transition = ui::PageTransitionFromInt(statement.ColumnInt(2)); result_vector->push_back(info); } } diff --git a/chrome/browser/history/visit_database.h b/chrome/browser/history/visit_database.h index e00f509..b8a175e 100644 --- a/chrome/browser/history/visit_database.h +++ b/chrome/browser/history/visit_database.h @@ -100,7 +100,7 @@ class VisitDatabase { bool GetVisitsInRangeForTransition(base::Time begin_time, base::Time end_time, int max_results, - content::PageTransition transition, + ui::PageTransition transition, VisitVector* visits); // Fills all visits in the given time range into the given vector that should diff --git a/chrome/browser/history/visit_database_unittest.cc b/chrome/browser/history/visit_database_unittest.cc index 28c68dc..a47e05e 100644 --- a/chrome/browser/history/visit_database_unittest.cc +++ b/chrome/browser/history/visit_database_unittest.cc @@ -71,19 +71,19 @@ class VisitDatabaseTest : public PlatformTest, TEST_F(VisitDatabaseTest, Add) { // Add one visit. - VisitRow visit_info1(1, Time::Now(), 0, content::PAGE_TRANSITION_LINK, 0); + VisitRow visit_info1(1, Time::Now(), 0, ui::PAGE_TRANSITION_LINK, 0); EXPECT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED)); // Add second visit for the same page. VisitRow visit_info2(visit_info1.url_id, visit_info1.visit_time + TimeDelta::FromSeconds(1), 1, - content::PAGE_TRANSITION_TYPED, 0); + ui::PAGE_TRANSITION_TYPED, 0); EXPECT_TRUE(AddVisit(&visit_info2, SOURCE_BROWSED)); // Add third visit for a different page. VisitRow visit_info3(2, visit_info1.visit_time + TimeDelta::FromSeconds(2), 0, - content::PAGE_TRANSITION_LINK, 0); + ui::PAGE_TRANSITION_LINK, 0); EXPECT_TRUE(AddVisit(&visit_info3, SOURCE_BROWSED)); // Query the first two. @@ -102,17 +102,17 @@ TEST_F(VisitDatabaseTest, Delete) { // should link them. static const int kTime1 = 1000; VisitRow visit_info1(1, Time::FromInternalValue(kTime1), 0, - content::PAGE_TRANSITION_LINK, 0); + ui::PAGE_TRANSITION_LINK, 0); EXPECT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED)); static const int kTime2 = kTime1 + 1; VisitRow visit_info2(1, Time::FromInternalValue(kTime2), - visit_info1.visit_id, content::PAGE_TRANSITION_LINK, 0); + visit_info1.visit_id, ui::PAGE_TRANSITION_LINK, 0); EXPECT_TRUE(AddVisit(&visit_info2, SOURCE_BROWSED)); static const int kTime3 = kTime2 + 1; VisitRow visit_info3(1, Time::FromInternalValue(kTime3), - visit_info2.visit_id, content::PAGE_TRANSITION_LINK, 0); + visit_info2.visit_id, ui::PAGE_TRANSITION_LINK, 0); EXPECT_TRUE(AddVisit(&visit_info3, SOURCE_BROWSED)); // First make sure all the visits are there. @@ -138,13 +138,13 @@ TEST_F(VisitDatabaseTest, Delete) { TEST_F(VisitDatabaseTest, Update) { // Make something in the database. - VisitRow original(1, Time::Now(), 23, content::PageTransitionFromInt(0), 19); + VisitRow original(1, Time::Now(), 23, ui::PageTransitionFromInt(0), 19); AddVisit(&original, SOURCE_BROWSED); // Mutate that row. VisitRow modification(original); modification.url_id = 2; - modification.transition = content::PAGE_TRANSITION_TYPED; + modification.transition = ui::PAGE_TRANSITION_TYPED; modification.visit_time = Time::Now() + TimeDelta::FromDays(1); modification.referring_visit = 9292; UpdateVisitRow(modification); @@ -166,48 +166,48 @@ std::vector<VisitRow> GetTestVisitRows() { // Add one visit. VisitRow visit_info1(1, base_time + TimeDelta::FromMinutes(1), 0, - static_cast<content::PageTransition>( - content::PAGE_TRANSITION_LINK | - content::PAGE_TRANSITION_CHAIN_START | - content::PAGE_TRANSITION_CHAIN_END), + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_LINK | + ui::PAGE_TRANSITION_CHAIN_START | + ui::PAGE_TRANSITION_CHAIN_END), 0); visit_info1.visit_id = 1; // Add second visit for the same page. VisitRow visit_info2(visit_info1.url_id, visit_info1.visit_time + TimeDelta::FromSeconds(1), 1, - static_cast<content::PageTransition>( - content::PAGE_TRANSITION_TYPED | - content::PAGE_TRANSITION_CHAIN_START | - content::PAGE_TRANSITION_CHAIN_END), + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_TYPED | + ui::PAGE_TRANSITION_CHAIN_START | + ui::PAGE_TRANSITION_CHAIN_END), 0); visit_info2.visit_id = 2; // Add third visit for a different page. VisitRow visit_info3(2, visit_info1.visit_time + TimeDelta::FromSeconds(2), 0, - static_cast<content::PageTransition>( - content::PAGE_TRANSITION_LINK | - content::PAGE_TRANSITION_CHAIN_START), + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_LINK | + ui::PAGE_TRANSITION_CHAIN_START), 0); visit_info3.visit_id = 3; // Add a redirect visit from the last page. VisitRow visit_info4(3, visit_info1.visit_time + TimeDelta::FromSeconds(3), visit_info3.visit_id, - static_cast<content::PageTransition>( - content::PAGE_TRANSITION_SERVER_REDIRECT | - content::PAGE_TRANSITION_CHAIN_END), + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_SERVER_REDIRECT | + ui::PAGE_TRANSITION_CHAIN_END), 0); visit_info4.visit_id = 4; // Add a subframe visit. VisitRow visit_info5(4, visit_info1.visit_time + TimeDelta::FromSeconds(4), visit_info4.visit_id, - static_cast<content::PageTransition>( - content::PAGE_TRANSITION_AUTO_SUBFRAME | - content::PAGE_TRANSITION_CHAIN_START | - content::PAGE_TRANSITION_CHAIN_END), + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_AUTO_SUBFRAME | + ui::PAGE_TRANSITION_CHAIN_START | + ui::PAGE_TRANSITION_CHAIN_END), 0); visit_info5.visit_id = 5; @@ -215,10 +215,10 @@ std::vector<VisitRow> GetTestVisitRows() { // later than visit 2. VisitRow visit_info6(visit_info1.url_id, visit_info2.visit_time + TimeDelta::FromDays(1), 1, - static_cast<content::PageTransition>( - content::PAGE_TRANSITION_TYPED | - content::PAGE_TRANSITION_CHAIN_START | - content::PAGE_TRANSITION_CHAIN_END), + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_TYPED | + ui::PAGE_TRANSITION_CHAIN_START | + ui::PAGE_TRANSITION_CHAIN_END), 0); visit_info6.visit_id = 6; @@ -355,13 +355,13 @@ TEST_F(VisitDatabaseTest, GetVisibleVisitsInRange) { TEST_F(VisitDatabaseTest, VisitSource) { // Add visits. - VisitRow visit_info1(111, Time::Now(), 0, content::PAGE_TRANSITION_LINK, 0); + VisitRow visit_info1(111, Time::Now(), 0, ui::PAGE_TRANSITION_LINK, 0); ASSERT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED)); - VisitRow visit_info2(112, Time::Now(), 1, content::PAGE_TRANSITION_TYPED, 0); + VisitRow visit_info2(112, Time::Now(), 1, ui::PAGE_TRANSITION_TYPED, 0); ASSERT_TRUE(AddVisit(&visit_info2, SOURCE_SYNCED)); - VisitRow visit_info3(113, Time::Now(), 0, content::PAGE_TRANSITION_TYPED, 0); + VisitRow visit_info3(113, Time::Now(), 0, ui::PAGE_TRANSITION_TYPED, 0); ASSERT_TRUE(AddVisit(&visit_info3, SOURCE_EXTENSION)); // Query each visit. diff --git a/chrome/browser/infobars/infobar_service.cc b/chrome/browser/infobars/infobar_service.cc index a748e05..5037cc8 100644 --- a/chrome/browser/infobars/infobar_service.cc +++ b/chrome/browser/infobars/infobar_service.cc @@ -23,8 +23,8 @@ using infobars::InfoBarManager; namespace { bool IsReload(const content::LoadCommittedDetails& details) { - return content::PageTransitionStripQualifier( - details.entry->GetTransitionType()) == content::PAGE_TRANSITION_RELOAD; + return ui::PageTransitionStripQualifier( + details.entry->GetTransitionType()) == ui::PAGE_TRANSITION_RELOAD; } @@ -41,10 +41,10 @@ InfoBarDelegate::NavigationDetails navigation_details.did_replace_entry = details.did_replace_entry; navigation_details.is_main_frame = details.is_main_frame; - const content::PageTransition transition = details.entry->GetTransitionType(); + const ui::PageTransition transition = details.entry->GetTransitionType(); navigation_details.is_reload = IsReload(details); navigation_details.is_redirect = - (transition & content::PAGE_TRANSITION_IS_REDIRECT_MASK) != 0; + (transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK) != 0; return navigation_details; } diff --git a/chrome/browser/infobars/insecure_content_infobar_delegate.cc b/chrome/browser/infobars/insecure_content_infobar_delegate.cc index bba9988..fa90ef461 100644 --- a/chrome/browser/infobars/insecure_content_infobar_delegate.cc +++ b/chrome/browser/infobars/insecure_content_infobar_delegate.cc @@ -13,9 +13,9 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" // static @@ -116,6 +116,6 @@ bool InsecureContentInfoBarDelegate::LinkClicked( "support/chrome/bin/answer.py?answer=1342714"), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } diff --git a/chrome/browser/local_discovery/privet_notifications.cc b/chrome/browser/local_discovery/privet_notifications.cc index 9d3c5f8..681539b 100644 --- a/chrome/browser/local_discovery/privet_notifications.cc +++ b/chrome/browser/local_discovery/privet_notifications.cc @@ -32,9 +32,9 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #include "ui/base/resource/resource_bundle.h" #include "ui/message_center/notifier_settings.h" @@ -400,7 +400,7 @@ void PrivetNotificationDelegate::OpenTab(const GURL& url) { chrome::NavigateParams params(profile_obj, url, - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); } diff --git a/chrome/browser/media/media_stream_infobar_delegate.cc b/chrome/browser/media/media_stream_infobar_delegate.cc index 90422d1..860b2dc 100644 --- a/chrome/browser/media/media_stream_infobar_delegate.cc +++ b/chrome/browser/media/media_stream_infobar_delegate.cc @@ -144,7 +144,7 @@ bool MediaStreamInfoBarDelegate::LinkClicked( GURL(chrome::kMediaAccessLearnMoreUrl), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; // Do not dismiss the info bar. } diff --git a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc index 71fd7fd..d046ac3 100644 --- a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc +++ b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc @@ -60,7 +60,7 @@ void OpenURL(const GURL& url) { chrome::NavigateParams params( ProfileManager::GetActiveUserProfile(), GURL(url), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); params.disposition = NEW_FOREGROUND_TAB; params.host_desktop_type = chrome::HOST_DESKTOP_TYPE_ASH; chrome::Navigate(¶ms); diff --git a/chrome/browser/nacl_host/nacl_infobar_delegate.cc b/chrome/browser/nacl_host/nacl_infobar_delegate.cc index 6fc29a0..2836dd3 100644 --- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc +++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc @@ -56,6 +56,6 @@ bool NaClInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { GURL("https://support.google.com/chrome/?p=ib_nacl"), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc index 948a0cf..b2cd40f 100644 --- a/chrome/browser/net/net_error_tab_helper.cc +++ b/chrome/browser/net/net_error_tab_helper.cc @@ -22,7 +22,7 @@ using chrome_common_net::DnsProbeStatus; using chrome_common_net::DnsProbeStatusToString; using content::BrowserContext; using content::BrowserThread; -using content::PageTransition; +using ui::PageTransition; using content::RenderViewHost; using content::WebContents; using content::WebContentsObserver; diff --git a/chrome/browser/net/net_error_tab_helper.h b/chrome/browser/net/net_error_tab_helper.h index 1104a96..89c623a 100644 --- a/chrome/browser/net/net_error_tab_helper.h +++ b/chrome/browser/net/net_error_tab_helper.h @@ -59,7 +59,7 @@ class NetErrorTabHelper virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; virtual void DidFailProvisionalLoad( content::RenderFrameHost* render_frame_host, diff --git a/chrome/browser/net/net_error_tab_helper_unittest.cc b/chrome/browser/net/net_error_tab_helper_unittest.cc index 3a98799..7dea643 100644 --- a/chrome/browser/net/net_error_tab_helper_unittest.cc +++ b/chrome/browser/net/net_error_tab_helper_unittest.cc @@ -7,9 +7,9 @@ #include "chrome/common/net/net_error_info.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "content/public/browser/browser_thread.h" -#include "content/public/common/page_transition_types.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" using chrome_browser_net::NetErrorTabHelper; using chrome_common_net::DnsProbeStatus; @@ -76,7 +76,7 @@ class NetErrorTabHelperTest : public ChromeRenderViewHostTestHarness { tab_helper_->DidCommitProvisionalLoadForFrame( (main_frame == MAIN_FRAME) ? main_rfh() : subframe_, bogus_url_, // url - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); } void FailProvisionalLoad(MainFrame main_frame, ErrorType error_type) { diff --git a/chrome/browser/net/sdch_browsertest.cc b/chrome/browser/net/sdch_browsertest.cc index 0401b25..2e552e7 100644 --- a/chrome/browser/net/sdch_browsertest.cc +++ b/chrome/browser/net/sdch_browsertest.cc @@ -400,7 +400,7 @@ class SdchBrowserTest : public InProcessBrowserTest, net::URLFetcherDelegate { chrome::AddSelectedTabWithURL(second_browser_, GURL(url::kAboutBlankURL), - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); content::WaitForLoadStop( second_browser_->tab_strip_model()->GetActiveWebContents()); second_browser_->window()->Show(); diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.cc index 5be0b9c..f936e1c 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.cc @@ -62,6 +62,6 @@ bool DataReductionProxyInfoBarDelegate::LinkClicked( GURL(link_url_), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return true; } diff --git a/chrome/browser/notifications/extension_welcome_notification.cc b/chrome/browser/notifications/extension_welcome_notification.cc index 84019ce..dd3a82a 100644 --- a/chrome/browser/notifications/extension_welcome_notification.cc +++ b/chrome/browser/notifications/extension_welcome_notification.cc @@ -80,7 +80,7 @@ class NotificationCallbacks chrome::NavigateParams params( profile_, GURL(chrome::kNotificationWelcomeLearnMoreURL), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; params.window_action = chrome::NavigateParams::SHOW_WINDOW; chrome::Navigate(¶ms); diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc index c9644bd..fb631fc 100644 --- a/chrome/browser/password_manager/password_manager_browsertest.cc +++ b/chrome/browser/password_manager/password_manager_browsertest.cc @@ -1015,7 +1015,7 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest, NoPromptWhenReloading) { PromptObserver::Create(WebContents())); GURL url = embedded_test_server()->GetURL("/password/password_form.html"); chrome::NavigateParams params(browser(), url, - content::PAGE_TRANSITION_RELOAD); + ui::PAGE_TRANSITION_RELOAD); ui_test_utils::NavigateToURL(¶ms); observer.Wait(); EXPECT_FALSE(prompt_observer->IsShowingPrompt()); diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc index e47326d..d4fd747 100644 --- a/chrome/browser/pepper_broker_infobar_delegate.cc +++ b/chrome/browser/pepper_broker_infobar_delegate.cc @@ -137,7 +137,7 @@ bool PepperBrokerInfoBarDelegate::LinkClicked( content::OpenURLParams( learn_more_url, content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc index fc1a476..aad0b73 100644 --- a/chrome/browser/platform_util_chromeos.cc +++ b/chrome/browser/platform_util_chromeos.cc @@ -42,7 +42,7 @@ void OpenExternal(Profile* profile, const GURL& url) { // this function directly and which would therefore break (e.g. // "Browser::EmailPageLocation" (to name only one). // As such we should keep this code here. - chrome::NavigateParams params(profile, url, content::PAGE_TRANSITION_LINK); + chrome::NavigateParams params(profile, url, ui::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; params.host_desktop_type = chrome::HOST_DESKTOP_TYPE_ASH; diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc index c032089..947d077 100644 --- a/chrome/browser/plugins/plugin_infobar_delegates.cc +++ b/chrome/browser/plugins/plugin_infobar_delegates.cc @@ -62,7 +62,7 @@ bool PluginInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { content::OpenURLParams( GURL(GetLearnMoreURL()), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } @@ -401,7 +401,7 @@ bool PluginInstallerInfoBarDelegate::LinkClicked( content::OpenURLParams( url, content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } @@ -521,7 +521,7 @@ bool PluginMetroModeInfoBarDelegate::LinkClicked( "https://support.google.com/chrome/?p=ib_redirect_to_desktop"), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } diff --git a/chrome/browser/plugins/plugin_installer.cc b/chrome/browser/plugins/plugin_installer.cc index 7c5ae85..bef3f4d 100644 --- a/chrome/browser/plugins/plugin_installer.cc +++ b/chrome/browser/plugins/plugin_installer.cc @@ -132,7 +132,7 @@ void PluginInstaller::OpenDownloadURL(const GURL& plugin_url, plugin_url, content::Referrer(web_contents->GetURL(), blink::WebReferrerPolicyDefault), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED, false)); + NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false)); FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadFinished()); } diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc index f869457..5e49883bd 100644 --- a/chrome/browser/plugins/plugin_observer.cc +++ b/chrome/browser/plugins/plugin_observer.cc @@ -454,7 +454,7 @@ void PluginObserver::OnOpenAboutPlugins() { GURL(chrome::kChromeUIPluginsURL), content::Referrer(web_contents()->GetURL(), blink::WebReferrerPolicyDefault), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK, false)); + NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_AUTO_BOOKMARK, false)); } void PluginObserver::OnCouldNotLoadPlugin(const base::FilePath& plugin_path) { diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 962015e..e8e1a4a 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -112,7 +112,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_constants.h" #include "content/public/common/content_paths.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/process_type.h" #include "content/public/common/result_codes.h" #include "content/public/common/url_constants.h" @@ -142,6 +141,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #include "ui/base/resource/resource_bundle.h" #include "url/gurl.h" @@ -2804,7 +2804,7 @@ IN_PROC_BROWSER_TEST_P(RestoreOnStartupPolicyTest, PRE_RunTest) { content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); chrome::AddSelectedTabWithURL(browser(), GURL(kRestoredURLs[i]), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); observer.Wait(); } } diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index ab2f4ce..7b11d46 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -1145,7 +1145,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { bool expect_swap_to_succeed) const { NavigateToURLWithParams( content::OpenURLParams(dest_url_, Referrer(), disposition, - content::PAGE_TRANSITION_TYPED, false), + ui::PAGE_TRANSITION_TYPED, false), expect_swap_to_succeed); } @@ -1165,7 +1165,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { bool expect_swap_to_succeed) const { NavigateToURLWithParams( content::OpenURLParams(dest_url, Referrer(), disposition, - content::PAGE_TRANSITION_TYPED, false), + ui::PAGE_TRANSITION_TYPED, false), expect_swap_to_succeed); } @@ -2139,7 +2139,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, GetActiveWebContents(), 2); current_browser()->OpenURL(OpenURLParams( navigate_url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); swap_observer.Wait(); EXPECT_TRUE(DidDisplayPass(GetActiveWebContents())); @@ -2632,7 +2632,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) { LoadURL( GURL(content::kChromeUICrashURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, std::string()); prerender->WaitForStop(); } @@ -3931,7 +3931,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderExtraHeadersNoSwap) { FINAL_STATUS_APP_TERMINATING, 1); content::OpenURLParams params(dest_url(), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false); + ui::PAGE_TRANSITION_TYPED, false); params.extra_headers = "X-Custom-Header: 42\r\n"; NavigateToURLWithParams(params, false); } @@ -3945,7 +3945,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, std::string post_data = "DATA"; content::OpenURLParams params(dest_url(), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false); + ui::PAGE_TRANSITION_TYPED, false); params.uses_post = true; params.browser_initiated_post_data = base::RefCountedString::TakeString(&post_data); @@ -4082,7 +4082,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReplaceCurrentEntry) { PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); content::OpenURLParams params(dest_url(), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false); + ui::PAGE_TRANSITION_TYPED, false); params.should_replace_current_entry = true; NavigateToURLWithParams(params, false); @@ -4131,9 +4131,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDoublePendingSwap) { current_browser()->tab_strip_model(), GetActiveWebContents(), 2); current_browser()->OpenURL(OpenURLParams( - url1, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); + url1, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); current_browser()->OpenURL(OpenURLParams( - url2, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); + url2, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); swap_observer.Wait(); // The WebContents should be on url2. There may be 2 or 3 entries, depending @@ -4175,7 +4175,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, &GetActiveWebContents()->GetController())); current_browser()->OpenURL(OpenURLParams( dest_url(), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); page_load_observer.Wait(); // Navigate somewhere else. This should succeed and abort the pending swap. @@ -4183,7 +4183,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, current_browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); nav_observer.Wait(); } diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 4821d1b..ae70ddc 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -38,8 +38,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/frame_navigate_params.h" -#include "content/public/common/page_transition_types.h" #include "net/url_request/url_request_context_getter.h" +#include "ui/base/page_transition_types.h" #include "ui/gfx/rect.h" using content::BrowserThread; @@ -382,15 +382,15 @@ void PrerenderContents::StartPrerendering( content::NavigationController::LoadURLParams load_url_params( prerender_url_); load_url_params.referrer = referrer_; - load_url_params.transition_type = content::PAGE_TRANSITION_LINK; + load_url_params.transition_type = ui::PAGE_TRANSITION_LINK; if (origin_ == ORIGIN_OMNIBOX) { - load_url_params.transition_type = content::PageTransitionFromInt( - content::PAGE_TRANSITION_TYPED | - content::PAGE_TRANSITION_FROM_ADDRESS_BAR); + load_url_params.transition_type = ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_TYPED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); } else if (origin_ == ORIGIN_INSTANT) { - load_url_params.transition_type = content::PageTransitionFromInt( - content::PAGE_TRANSITION_GENERATED | - content::PAGE_TRANSITION_FROM_ADDRESS_BAR); + load_url_params.transition_type = ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_GENERATED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); } load_url_params.override_user_agent = prerender_manager_->config().is_overriding_user_agent ? diff --git a/chrome/browser/prerender/prerender_local_predictor.cc b/chrome/browser/prerender/prerender_local_predictor.cc index 4036482..09af20f 100644 --- a/chrome/browser/prerender/prerender_local_predictor.cc +++ b/chrome/browser/prerender/prerender_local_predictor.cc @@ -39,12 +39,12 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "crypto/secure_hash.h" #include "grit/browser_resources.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" +#include "ui/base/page_transition_types.h" #include "ui/base/resource/resource_bundle.h" #include "url/url_canon.h" @@ -52,7 +52,7 @@ using base::DictionaryValue; using base::ListValue; using base::Value; using content::BrowserThread; -using content::PageTransition; +using ui::PageTransition; using content::RenderFrameHost; using content::SessionStorageNamespace; using content::WebContents; @@ -249,20 +249,20 @@ int GetMaxLocalPredictionTimeMs() { } bool IsBackForward(PageTransition transition) { - return (transition & content::PAGE_TRANSITION_FORWARD_BACK) != 0; + return (transition & ui::PAGE_TRANSITION_FORWARD_BACK) != 0; } bool IsHomePage(PageTransition transition) { - return (transition & content::PAGE_TRANSITION_HOME_PAGE) != 0; + return (transition & ui::PAGE_TRANSITION_HOME_PAGE) != 0; } bool IsIntermediateRedirect(PageTransition transition) { - return (transition & content::PAGE_TRANSITION_CHAIN_END) == 0; + return (transition & ui::PAGE_TRANSITION_CHAIN_END) == 0; } bool IsFormSubmit(PageTransition transition) { - return PageTransitionCoreTypeIs(transition, - content::PAGE_TRANSITION_FORM_SUBMIT); + return ui::PageTransitionCoreTypeIs(transition, + ui::PAGE_TRANSITION_FORM_SUBMIT); } bool ShouldExcludeTransitionForPrediction(PageTransition transition) { diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 396a502..2baad06 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -1110,7 +1110,7 @@ void PrerenderManager::PendingSwap::ProvisionalChangeToMainFrameUrl( void PrerenderManager::PendingSwap::DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& validated_url, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { if (render_frame_host->GetParent()) return; prerender_data_->ClearPendingSwap(); diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h index 11f1ef5..8fc5a1a 100644 --- a/chrome/browser/prerender/prerender_manager.h +++ b/chrome/browser/prerender/prerender_manager.h @@ -484,7 +484,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>, virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& validated_url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; virtual void DidFailProvisionalLoad( content::RenderFrameHost* render_frame_host, const GURL& validated_url, diff --git a/chrome/browser/prerender/prerender_tab_helper.cc b/chrome/browser/prerender/prerender_tab_helper.cc index 64b9a39..8ddd08a 100644 --- a/chrome/browser/prerender/prerender_tab_helper.cc +++ b/chrome/browser/prerender/prerender_tab_helper.cc @@ -99,7 +99,7 @@ void PrerenderTabHelper::ProvisionalChangeToMainFrameUrl( void PrerenderTabHelper::DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& validated_url, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { if (render_frame_host->GetParent()) return; RecordEvent(EVENT_MAINFRAME_COMMIT); diff --git a/chrome/browser/prerender/prerender_tab_helper.h b/chrome/browser/prerender/prerender_tab_helper.h index 260091d..361ee8f 100644 --- a/chrome/browser/prerender/prerender_tab_helper.h +++ b/chrome/browser/prerender/prerender_tab_helper.h @@ -64,7 +64,7 @@ class PrerenderTabHelper virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& validated_url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; // Called when a password form has been submitted. void PasswordSubmitted(const autofill::PasswordForm& form); diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index 34f68ed..cbd935b 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -731,7 +731,7 @@ void CreateCloudPrintSigninTab(Browser* browser, url, g_browser_process->GetApplicationLocale()), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_AUTO_BOOKMARK, + ui::PAGE_TRANSITION_AUTO_BOOKMARK, false)); new SignInObserver(web_contents, cloud_devices::GetCloudPrintURL(), callback); diff --git a/chrome/browser/printing/print_preview_dialog_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc index c8e50d2..aac04bc 100644 --- a/chrome/browser/printing/print_preview_dialog_controller.cc +++ b/chrome/browser/printing/print_preview_dialog_controller.cc @@ -337,13 +337,13 @@ void PrintPreviewDialogController::OnNavEntryCommitted( if (contents == preview_dialog) { // Preview dialog navigated. if (details) { - content::PageTransition transition_type = + ui::PageTransition transition_type = details->entry->GetTransitionType(); content::NavigationType nav_type = details->type; // New |preview_dialog| is created. Don't update/erase map entry. if (waiting_for_new_preview_page_ && - transition_type == content::PAGE_TRANSITION_AUTO_TOPLEVEL && + transition_type == ui::PAGE_TRANSITION_AUTO_TOPLEVEL && nav_type == content::NAVIGATION_TYPE_NEW_PAGE) { waiting_for_new_preview_page_ = false; SaveInitiatorTitle(preview_dialog); @@ -352,7 +352,7 @@ void PrintPreviewDialogController::OnNavEntryCommitted( // Cloud print sign-in causes a reload. if (!waiting_for_new_preview_page_ && - transition_type == content::PAGE_TRANSITION_RELOAD && + transition_type == ui::PAGE_TRANSITION_RELOAD && nav_type == content::NAVIGATION_TYPE_EXISTING_PAGE && IsPrintPreviewURL(details->previous_url)) { return; diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index 0ebe12d..f6fa9d6 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -1296,7 +1296,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { OpenURL(handlers[handlerIndex].TranslateUrl(params_.link_url), GetDocumentURL(params_), disposition, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); return; } @@ -1308,19 +1308,19 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { GetDocumentURL(params_), !browser || browser->is_app() ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); break; } case IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW: OpenURL(params_.link_url, GetDocumentURL(params_), NEW_WINDOW, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); break; case IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD: OpenURL(params_.link_url, GURL(), OFF_THE_RECORD, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); break; case IDC_CONTENT_CONTEXT_SAVELINKAS: { @@ -1379,7 +1379,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { OpenURL(params_.src_url, GetDocumentURL(params_), NEW_BACKGROUND_TAB, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); break; case IDC_CONTENT_CONTEXT_PLAYPAUSE: { @@ -1623,14 +1623,14 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { WindowOpenDisposition disposition = ForceNewTabDispositionFromEventFlags(event_flags); OpenURL(selection_navigation_url_, GURL(), disposition, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); break; } case IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS: { WindowOpenDisposition disposition = ForceNewTabDispositionFromEventFlags(event_flags); GURL url = chrome::GetSettingsUrl(chrome::kLanguageOptionsSubPage); - OpenURL(url, GURL(), disposition, content::PAGE_TRANSITION_LINK); + OpenURL(url, GURL(), disposition, ui::PAGE_TRANSITION_LINK); break; } @@ -1640,7 +1640,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { WindowOpenDisposition disposition = ForceNewTabDispositionFromEventFlags(event_flags); GURL url = chrome::GetSettingsUrl(chrome::kHandlerSettingsSubPage); - OpenURL(url, GURL(), disposition, content::PAGE_TRANSITION_LINK); + OpenURL(url, GURL(), disposition, ui::PAGE_TRANSITION_LINK); break; } diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h index bbf8b0a..a2a65a4 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -19,7 +19,6 @@ #include "components/renderer_context_menu/render_view_context_menu_observer.h" #include "components/renderer_context_menu/render_view_context_menu_proxy.h" #include "content/public/common/context_menu_params.h" -#include "content/public/common/page_transition_types.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/renderer_context_menu/spelling_bubble_model.cc b/chrome/browser/renderer_context_menu/spelling_bubble_model.cc index 1f3136a..9f66ef7 100644 --- a/chrome/browser/renderer_context_menu/spelling_bubble_model.cc +++ b/chrome/browser/renderer_context_menu/spelling_bubble_model.cc @@ -66,7 +66,7 @@ base::string16 SpellingBubbleModel::GetLinkText() const { void SpellingBubbleModel::LinkClicked() { OpenURLParams params( GURL(chrome::kPrivacyLearnMoreURL), Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); web_contents_->OpenURL(params); } diff --git a/chrome/browser/repost_form_warning_browsertest.cc b/chrome/browser/repost_form_warning_browsertest.cc index a8b28e0..0a17796 100644 --- a/chrome/browser/repost_form_warning_browsertest.cc +++ b/chrome/browser/repost_form_warning_browsertest.cc @@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestLoginAfterRepost) { content::Source<content::NavigationController>(&controller)); browser()->OpenURL(content::OpenURLParams( test_server()->GetURL("auth-basic"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); observer.Wait(); // Try to reload it again. @@ -86,6 +86,6 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestLoginAfterRepost) { content::TestNavigationObserver navigation_observer(web_contents); browser()->OpenURL(content::OpenURLParams( test_server()->GetURL("bar"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); navigation_observer.Wait(); } diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index d6fac06..90223fc 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -426,7 +426,7 @@ void RLZTracker::Observe(int type, content::Details<content::NavigationEntry>(details).ptr(); if (entry != NULL && ((entry->GetTransitionType() & - content::PAGE_TRANSITION_HOME_PAGE) != 0)) { + ui::PAGE_TRANSITION_HOME_PAGE) != 0)) { RecordFirstSearch(ChromeHomePage()); registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_PENDING, content::NotificationService::AllSources()); diff --git a/chrome/browser/rlz/rlz_unittest.cc b/chrome/browser/rlz/rlz_unittest.cc index 15ed34a..23e1dc1 100644 --- a/chrome/browser/rlz/rlz_unittest.cc +++ b/chrome/browser/rlz/rlz_unittest.cc @@ -252,7 +252,7 @@ void RlzLibTest::SimulateOmniboxUsage() { void RlzLibTest::SimulateHomepageUsage() { scoped_ptr<NavigationEntry> entry(NavigationEntry::Create()); entry->SetPageID(0); - entry->SetTransitionType(content::PAGE_TRANSITION_HOME_PAGE); + entry->SetTransitionType(ui::PAGE_TRANSITION_HOME_PAGE); tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING, content::NotificationService::AllSources(), content::Details<NavigationEntry>(entry.get())); @@ -827,7 +827,7 @@ TEST_F(RlzLibTest, PingUpdatesRlzCache) { TEST_F(RlzLibTest, ObserveHandlesBadArgs) { scoped_ptr<NavigationEntry> entry(NavigationEntry::Create()); entry->SetPageID(0); - entry->SetTransitionType(content::PAGE_TRANSITION_LINK); + entry->SetTransitionType(ui::PAGE_TRANSITION_LINK); tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING, content::NotificationService::AllSources(), content::Details<NavigationEntry>(NULL)); diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index 0a37c7f..4bb6e5d 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc @@ -25,7 +25,7 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" using content::BrowserThread; @@ -122,7 +122,7 @@ static void AddNavigationFeatures( request); AddFeature(feature_prefix + features::kPageTransitionType, static_cast<double>( - content::PageTransitionStripQualifier( + ui::PageTransitionStripQualifier( entry->GetTransitionType())), request); AddFeature(feature_prefix + features::kIsFirstNavigation, @@ -345,17 +345,17 @@ void BrowserFeatureExtractor::QueryUrlHistoryDone( for (history::VisitVector::const_iterator it = visits.begin(); it != visits.end(); ++it) { - if (!content::PageTransitionIsMainFrame(it->transition)) { + if (!ui::PageTransitionIsMainFrame(it->transition)) { continue; } if (it->visit_time < threshold) { ++num_visits_24h_ago; } - content::PageTransition transition = content::PageTransitionStripQualifier( + ui::PageTransition transition = ui::PageTransitionStripQualifier( it->transition); - if (transition == content::PAGE_TRANSITION_TYPED) { + if (transition == ui::PAGE_TRANSITION_TYPED) { ++num_visits_typed; - } else if (transition == content::PAGE_TRANSITION_LINK) { + } else if (transition == ui::PAGE_TRANSITION_LINK) { ++num_visits_link; } } diff --git a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc index 2fc6fec..793dda3 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc @@ -26,12 +26,12 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/web_contents_tester.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" using content::BrowserThread; @@ -121,14 +121,14 @@ class BrowserFeatureExtractorTest : public ChromeRenderViewHostTestHarness { std::vector<GURL> redirect_chain; redirect_chain.push_back(url); SetRedirectChain(redirect_chain, true); - NavigateAndCommit(url, GURL(), content::PAGE_TRANSITION_LINK); + NavigateAndCommit(url, GURL(), ui::PAGE_TRANSITION_LINK); } // This is similar to NavigateAndCommit that is in WebContentsTester, but // allows us to specify the referrer and page_transition_type. void NavigateAndCommit(const GURL& url, const GURL& referrer, - content::PageTransition type) { + ui::PageTransition type) { web_contents()->GetController().LoadURL( url, content::Referrer(referrer, blink::WebReferrerPolicyDefault), type, std::string()); @@ -269,17 +269,17 @@ TEST_F(BrowserFeatureExtractorTest, UrlInHistory) { history_service()->AddPage(GURL("http://www.foo.com/bar.html?a=b"), base::Time::Now() - base::TimeDelta::FromHours(23), NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); history_service()->AddPage(GURL("http://www.foo.com/bar.html"), base::Time::Now() - base::TimeDelta::FromHours(25), NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); history_service()->AddPage(GURL("https://www.foo.com/goo.html"), base::Time::Now() - base::TimeDelta::FromDays(5), NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); SimpleNavigateAndCommit(GURL("http://www.foo.com/bar.html")); @@ -372,9 +372,9 @@ TEST_F(BrowserFeatureExtractorTest, BrowseFeatures) { browse_info_->http_status_code = 200; NavigateAndCommit(GURL("http://www.foo.com/"), GURL("http://google.com/"), - content::PageTransitionFromInt( - content::PAGE_TRANSITION_AUTO_BOOKMARK | - content::PAGE_TRANSITION_FORWARD_BACK)); + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_AUTO_BOOKMARK | + ui::PAGE_TRANSITION_FORWARD_BACK)); EXPECT_TRUE(ExtractFeatures(&request)); std::map<std::string, double> features; @@ -410,10 +410,10 @@ TEST_F(BrowserFeatureExtractorTest, BrowseFeatures) { browse_info_->http_status_code = 404; NavigateAndCommit(GURL("http://www.foo.com/page.html"), GURL("http://www.foo.com"), - content::PageTransitionFromInt( - content::PAGE_TRANSITION_TYPED | - content::PAGE_TRANSITION_CHAIN_START | - content::PAGE_TRANSITION_CLIENT_REDIRECT)); + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_TYPED | + ui::PAGE_TRANSITION_CHAIN_START | + ui::PAGE_TRANSITION_CLIENT_REDIRECT)); EXPECT_TRUE(ExtractFeatures(&request)); features.clear(); @@ -463,10 +463,10 @@ TEST_F(BrowserFeatureExtractorTest, BrowseFeatures) { SetRedirectChain(redirect_chain, true); NavigateAndCommit(GURL("http://www.bar.com/"), GURL("http://www.foo.com/page.html"), - content::PageTransitionFromInt( - content::PAGE_TRANSITION_LINK | - content::PAGE_TRANSITION_CHAIN_END | - content::PAGE_TRANSITION_CLIENT_REDIRECT)); + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_LINK | + ui::PAGE_TRANSITION_CHAIN_END | + ui::PAGE_TRANSITION_CLIENT_REDIRECT)); EXPECT_TRUE(ExtractFeatures(&request)); features.clear(); @@ -502,7 +502,7 @@ TEST_F(BrowserFeatureExtractorTest, BrowseFeatures) { SetRedirectChain(redirect_chain, false); NavigateAndCommit(GURL("http://www.bar.com/other_page.html"), GURL("http://www.bar.com/"), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); EXPECT_TRUE(ExtractFeatures(&request)); features.clear(); @@ -542,7 +542,7 @@ TEST_F(BrowserFeatureExtractorTest, BrowseFeatures) { SetRedirectChain(redirect_chain, true); NavigateAndCommit(GURL("http://www.baz.com"), GURL("https://bankofamerica.com"), - content::PAGE_TRANSITION_GENERATED); + ui::PAGE_TRANSITION_GENERATED); EXPECT_TRUE(ExtractFeatures(&request)); features.clear(); diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 20590b5..7ff86627 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -380,7 +380,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness { void NavigateWithSBHitAndCommit(const GURL& url) { // Create a pending navigation. controller().LoadURL( - url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); + url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); ASSERT_TRUE(pending_rvh()); if (web_contents()->GetRenderViewHost()->GetProcess()->GetID() == @@ -415,7 +415,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness { void NavigateWithoutSBHitAndCommit(const GURL& safe_url) { controller().LoadURL( - safe_url, content::Referrer(), content::PAGE_TRANSITION_LINK, + safe_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); ASSERT_TRUE(pending_rvh()); diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index bedb410..d9edf0f 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc @@ -993,7 +993,7 @@ void DownloadProtectionService::ShowDetailsForDownload( content::OpenURLParams(learn_more_url, content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); } diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc index 9242ef4..7db845a 100644 --- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc @@ -1290,7 +1290,7 @@ TEST_F(DownloadProtectionServiceTest, 0, GURL(), redirects, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc index a952b1f..1431f61 100644 --- a/chrome/browser/safe_browsing/malware_details_unittest.cc +++ b/chrome/browser/safe_browsing/malware_details_unittest.cc @@ -312,7 +312,7 @@ class MalwareDetailsTest : public ChromeRenderViewHostTestHarness { redirects->push_back(url); history_service()->AddPage( url, base::Time::Now(), reinterpret_cast<history::ContextID>(1), 0, - GURL(), *redirects, content::PAGE_TRANSITION_TYPED, + GURL(), *redirects, ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); } @@ -323,7 +323,7 @@ class MalwareDetailsTest : public ChromeRenderViewHostTestHarness { TEST_F(MalwareDetailsTest, MalwareSubResource) { // Start a load. controller().LoadURL(GURL(kLandingURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); UnsafeResource resource; InitResource(&resource, true, GURL(kMalwareURL)); @@ -355,7 +355,7 @@ TEST_F(MalwareDetailsTest, MalwareSubResource) { // different original_url. TEST_F(MalwareDetailsTest, MalwareSubResourceWithOriginalUrl) { controller().LoadURL(GURL(kLandingURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); UnsafeResource resource; InitResource(&resource, true, GURL(kMalwareURL)); @@ -395,7 +395,7 @@ TEST_F(MalwareDetailsTest, MalwareSubResourceWithOriginalUrl) { // Tests creating a malware report with data from the renderer. TEST_F(MalwareDetailsTest, MalwareDOMDetails) { controller().LoadURL(GURL(kLandingURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); UnsafeResource resource; InitResource(&resource, true, GURL(kMalwareURL)); @@ -450,7 +450,7 @@ TEST_F(MalwareDetailsTest, MalwareDOMDetails) { // Verify that https:// urls are dropped. TEST_F(MalwareDetailsTest, NotPublicUrl) { controller().LoadURL(GURL(kHttpsURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); UnsafeResource resource; InitResource(&resource, true, GURL(kMalwareURL)); scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap( @@ -474,7 +474,7 @@ TEST_F(MalwareDetailsTest, NotPublicUrl) { // resource url TEST_F(MalwareDetailsTest, MalwareWithRedirectUrl) { controller().LoadURL(GURL(kLandingURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); UnsafeResource resource; InitResource(&resource, true, GURL(kMalwareURL)); @@ -526,7 +526,7 @@ TEST_F(MalwareDetailsTest, MalwareWithRedirectUrl) { // Tests the interaction with the HTTP cache. TEST_F(MalwareDetailsTest, HTTPCache) { controller().LoadURL(GURL(kLandingURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); UnsafeResource resource; InitResource(&resource, true, GURL(kMalwareURL)); @@ -598,7 +598,7 @@ TEST_F(MalwareDetailsTest, HTTPCache) { // Tests the interaction with the HTTP cache (where the cache is empty). TEST_F(MalwareDetailsTest, HTTPCacheNoEntries) { controller().LoadURL(GURL(kLandingURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); UnsafeResource resource; InitResource(&resource, true, GURL(kMalwareURL)); @@ -651,7 +651,7 @@ TEST_F(MalwareDetailsTest, HistoryServiceUrls) { profile()->BlockUntilHistoryProcessesPendingRequests(); controller().LoadURL(GURL(kLandingURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); UnsafeResource resource; InitResource(&resource, true, GURL(kMalwareURL)); diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index be1adc9..ebd0b7d 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -276,7 +276,7 @@ void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) { OpenURLParams params(learn_more_url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); web_contents_->OpenURL(params); return; @@ -292,7 +292,7 @@ void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) { OpenURLParams params(privacy_url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); web_contents_->OpenURL(params); return; @@ -329,7 +329,7 @@ void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) { web_contents_->GetController().LoadURL( GURL(chrome::kChromeUINewTabURL), content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } return; @@ -371,7 +371,7 @@ void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) { unsafe_resources_[element_index].threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL); OpenURLParams params( - diagnostic_url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_LINK, + diagnostic_url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_LINK, false); web_contents_->OpenURL(params); return; diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc index 3043a95..4e32b24 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -124,7 +124,7 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness { void Navigate(const char* url, int page_id) { WebContentsTester::For(web_contents())->TestDidNavigate( web_contents()->GetMainFrame(), page_id, GURL(url), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); } void GoBack(bool is_cross_site) { @@ -141,7 +141,7 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness { rfh, entry->GetPageID(), GURL(entry->GetURL()), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); } void ShowInterstitial(bool is_subresource, const char* url) { @@ -220,7 +220,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwarePageDontProceed) { // Start a load. controller().LoadURL(GURL(kBadURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the load causing a safe browsing interstitial to be shown. @@ -256,7 +256,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwarePageProceed) { // Start a load. controller().LoadURL(GURL(kBadURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the load causing a safe browsing interstitial to be shown. ShowInterstitial(false, kBadURL); @@ -520,7 +520,7 @@ TEST_F(SafeBrowsingBlockingPageTest, NavigatingBackAndForth) { // Now navigate to a bad page triggerring an interstitial. controller().LoadURL(GURL(kBadURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); ShowInterstitial(false, kBadURL); SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage(); @@ -567,7 +567,7 @@ TEST_F(SafeBrowsingBlockingPageTest, ProceedThenDontProceed) { // Start a load. controller().LoadURL(GURL(kBadURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the load causing a safe browsing interstitial to be shown. ShowInterstitial(false, kBadURL); @@ -604,7 +604,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwareReportsDisabled) { // Start a load. controller().LoadURL(GURL(kBadURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the load causing a safe browsing interstitial to be shown. ShowInterstitial(false, kBadURL); @@ -639,7 +639,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwareReportsToggling) { // Start a load. controller().LoadURL(GURL(kBadURL), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the load causing a safe browsing interstitial to be shown. ShowInterstitial(false, kBadURL); diff --git a/chrome/browser/search/search_terms_tracker.cc b/chrome/browser/search/search_terms_tracker.cc index a99f915..444ab5f 100644 --- a/chrome/browser/search/search_terms_tracker.cc +++ b/chrome/browser/search/search_terms_tracker.cc @@ -112,7 +112,7 @@ bool SearchTermsTracker::FindMostRecentSearch( // Do not consider any navigations that precede a non-web-triggerable // navigation as they are not related to those terms. - if (!content::PageTransitionIsWebTriggerable( + if (!ui::PageTransitionIsWebTriggerable( entry->GetTransitionType())) { break; } diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc index 0326078..ad923b4 100644 --- a/chrome/browser/search/search_unittest.cc +++ b/chrome/browser/search/search_unittest.cc @@ -291,7 +291,7 @@ TEST_F(SearchTest, ProcessIsolation_RendererInitiated) { content::NavigationController::LoadURLParams load_params( GURL(test.end_url)); load_params.is_renderer_initiated = true; - load_params.transition_type = content::PAGE_TRANSITION_LINK; + load_params.transition_type = ui::PAGE_TRANSITION_LINK; controller->LoadURLWithParams(load_params); CommitPendingLoad(controller); @@ -356,7 +356,7 @@ TEST_F(SearchTest, InstantNTPCustomNavigationEntry) { controller.SetTransientEntry( controller.CreateNavigationEntry(GURL("chrome://blank"), content::Referrer(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false, std::string(), contents->GetBrowserContext())); diff --git a/chrome/browser/search_engines/chrome_template_url_service_client.cc b/chrome/browser/search_engines/chrome_template_url_service_client.cc index 64cfeb4..a79f2fc 100644 --- a/chrome/browser/search_engines/chrome_template_url_service_client.cc +++ b/chrome/browser/search_engines/chrome_template_url_service_client.cc @@ -61,7 +61,7 @@ void ChromeTemplateURLServiceClient::AddKeywordGeneratedVisit(const GURL& url) { if (history_service) history_service->AddPage(url, base::Time::Now(), NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_KEYWORD_GENERATED, + ui::PAGE_TRANSITION_KEYWORD_GENERATED, history::SOURCE_BROWSED, false); } @@ -90,7 +90,7 @@ void ChromeTemplateURLServiceClient::Observe( TemplateURLService::URLVisitedDetails visited_details; visited_details.url = history_details->row.url(); visited_details.is_keyword_transition = - content::PageTransitionStripQualifier(history_details->transition) == - content::PAGE_TRANSITION_KEYWORD; + ui::PageTransitionStripQualifier(history_details->transition) == + ui::PAGE_TRANSITION_KEYWORD; owner_->OnHistoryURLVisited(visited_details); } diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index 24f1274..8ef28b6 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -1123,7 +1123,7 @@ class SessionRestoreImpl : public content::NotificationObserver { if (i == 0) add_types |= TabStripModel::ADD_ACTIVE; chrome::NavigateParams params(browser, urls[i], - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); params.disposition = i == 0 ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; params.tabstrip_add_types = add_types; chrome::Navigate(¶ms); diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 5424bca..eed7405 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -43,10 +43,10 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/bindings_policy.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "sync/protocol/session_specifics.pb.h" +#include "ui/base/page_transition_types.h" using sessions::SerializedNavigationEntry; using sessions::SerializedNavigationEntryTestHelper; @@ -144,7 +144,7 @@ class SessionRestoreTest : public InProcessBrowserTest { } else { chrome::NavigateParams params(profile, url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); chrome::Navigate(¶ms); } Browser* new_browser = window_observer.WaitForSingleNewBrowser(); @@ -401,7 +401,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) { content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); chrome::AddSelectedTabWithURL(browser(), url2, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); observer.Wait(); } { @@ -409,7 +409,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) { content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); chrome::AddSelectedTabWithURL(browser(), url3, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); observer.Wait(); } @@ -893,7 +893,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ActiveIndexUpdatedAtInsert) { ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); chrome::NavigateParams navigate_params(browser(), url3_, - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); navigate_params.tabstrip_index = 0; navigate_params.disposition = NEW_BACKGROUND_TAB; ui_test_utils::NavigateToURL(&navigate_params); diff --git a/chrome/browser/sessions/session_types.h b/chrome/browser/sessions/session_types.h index de140f1..35b4d29 100644 --- a/chrome/browser/sessions/session_types.h +++ b/chrome/browser/sessions/session_types.h @@ -14,7 +14,6 @@ #include "base/time/time.h" #include "components/sessions/serialized_navigation_entry.h" #include "components/sessions/session_id.h" -#include "content/public/common/page_transition_types.h" #include "sync/protocol/session_specifics.pb.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/sessions/session_types_unittest.cc b/chrome/browser/sessions/session_types_unittest.cc index 45672f7..831ebbb 100644 --- a/chrome/browser/sessions/session_types_unittest.cc +++ b/chrome/browser/sessions/session_types_unittest.cc @@ -13,10 +13,10 @@ #include "base/time/time.h" #include "chrome/browser/search/search.h" #include "components/sessions/serialized_navigation_entry_test_helper.h" -#include "content/public/common/page_transition_types.h" #include "sync/protocol/session_specifics.pb.h" #include "sync/util/time.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" namespace { @@ -66,7 +66,7 @@ TEST(SessionTab, FromSyncData) { EXPECT_EQ(i, tab.navigations[i].index()); EXPECT_EQ(GURL("referrer"), tab.navigations[i].referrer().url); EXPECT_EQ(base::ASCIIToUTF16("title"),tab.navigations[i].title()); - EXPECT_EQ(content::PAGE_TRANSITION_TYPED, + EXPECT_EQ(ui::PAGE_TRANSITION_TYPED, tab.navigations[i].transition_type()); EXPECT_EQ(GURL("http://foo/" + base::IntToString(i)), tab.navigations[i].virtual_url()); diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc index 30cf4e4..b0e55b6 100644 --- a/chrome/browser/sessions/tab_restore_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_browsertest.cc @@ -432,7 +432,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWithExistingSiteInstance) { static_cast<content::WebContentsDelegate*>(browser())->OpenURLFromTab( tab, content::OpenURLParams(http_url2, content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); observer.Wait(); // Close the tab. diff --git a/chrome/browser/signin/signin_browsertest.cc b/chrome/browser/signin/signin_browsertest.cc index 623abdc..5354e4c 100644 --- a/chrome/browser/signin/signin_browsertest.cc +++ b/chrome/browser/signin/signin_browsertest.cc @@ -186,7 +186,7 @@ class BackOnNTPCommitObserver : public content::WebContentsObserver { virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE { + ui::PageTransition transition_type) OVERRIDE { if (url == GURL(chrome::kChromeUINewTabURL) || url == GURL(chrome::kChromeSearchLocalNtpUrl)) { content::WindowedNotificationObserver observer( @@ -225,7 +225,7 @@ IN_PROC_BROWSER_TEST_F(SigninBrowserTest, SigninSkipForNowAndGoBack) { // from the history. chrome::NavigateParams navigate_params(browser(), skip_url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); ui_test_utils::NavigateToURL(&navigate_params); // Register an observer that will navigate back immediately on the commit of diff --git a/chrome/browser/signin/signin_header_helper.cc b/chrome/browser/signin/signin_header_helper.cc index dd84375..2e479e2 100644 --- a/chrome/browser/signin/signin_header_helper.cc +++ b/chrome/browser/signin/signin_header_helper.cc @@ -155,7 +155,7 @@ void ProcessMirrorHeaderUIThread( if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) { web_contents->OpenURL(content::OpenURLParams( GURL(chrome::kChromeUINativeNewTabURL), content::Referrer(), - OFF_THE_RECORD, content::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); + OFF_THE_RECORD, ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); } else { AccountManagementScreenHelper::OpenAccountManagementScreen( Profile::FromBrowserContext(web_contents->GetBrowserContext()), @@ -258,7 +258,7 @@ void ProcessMirrorResponseHeaderIfExists( content::ResourceRequestInfo::ForRequest(request); if (!(info && info->IsMainFrame() && (info->HasUserGesture() || - !content::PageTransitionIsWebTriggerable(info->GetPageTransition())))) + !ui::PageTransitionIsWebTriggerable(info->GetPageTransition())))) return; std::string header_value; diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc index 64a49c2..c122f28 100644 --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc @@ -171,7 +171,7 @@ void ShowSigninErrorLearnMorePage(Profile* profile) { static const char kSigninErrorLearnMoreUrl[] = "https://support.google.com/chrome/answer/1181420?"; chrome::NavigateParams params( - profile, GURL(kSigninErrorLearnMoreUrl), content::PAGE_TRANSITION_LINK); + profile, GURL(kSigninErrorLearnMoreUrl), ui::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); } diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 3d78d5f..5e54d5b 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -676,7 +676,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestWSSInvalidCertAndClose) { WebContents* tabs[16]; for (int i = 0; i < 16; ++i) { tabs[i] = chrome::AddSelectedTabWithURL(browser(), slave_url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); } chrome::SelectNextTab(browser()); @@ -830,7 +830,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) { GURL url = https_server_expired_.GetURL("files/ssl/google.htm"); WebContents* tab2 = chrome::AddSelectedTabWithURL( - browser(), url, content::PAGE_TRANSITION_TYPED); + browser(), url, ui::PAGE_TRANSITION_TYPED); content::WaitForLoadStop(tab2); // Verify our assumption that there was no prior navigation. @@ -865,7 +865,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) { content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); chrome::NavigateParams navigate_params(browser(), url_dangerous, - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); chrome::Navigate(&navigate_params); observer.Wait(); } @@ -1054,7 +1054,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentTwoTabs) { &replacement_path)); GURL url = https_server_.GetURL(replacement_path); - chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_TYPED); + chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_TYPED); params.disposition = NEW_FOREGROUND_TAB; params.tabstrip_index = 0; params.source_contents = tab1; @@ -1097,7 +1097,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) { // disposition won't usually stay in the same process, but this works // because we are using process-per-site in SetUpCommandLine. GURL url = https_server_.GetURL(replacement_path); - chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_TYPED); + chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_TYPED); params.disposition = NEW_FOREGROUND_TAB; params.source_contents = tab1; content::WindowedNotificationObserver observer( @@ -1291,7 +1291,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) { content::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, ui::PAGE_TRANSITION_TYPED); observer.Wait(); // Close the first tab. @@ -1855,7 +1855,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, InterstitialNotAffectedByHideShow) { AddTabAtIndex(0, https_server_.GetURL("files/ssl/google.html"), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); EXPECT_EQ(2, browser()->tab_strip_model()->count()); EXPECT_EQ(0, browser()->tab_strip_model()->active_index()); EXPECT_EQ(tab, browser()->tab_strip_model()->GetWebContentsAt(1)); diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc index 6a8c34f..a24949b 100644 --- a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc +++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc @@ -181,7 +181,7 @@ void SupervisedUserNavigationObserver::WarnInfoBarDismissed() { void SupervisedUserNavigationObserver::DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { if (render_frame_host->GetParent()) return; @@ -229,7 +229,7 @@ void SupervisedUserNavigationObserver::OnRequestBlockedInternal( history::HistoryAddPageArgs add_page_args( url, timestamp, web_contents(), 0, url, history::RedirectList(), - content::PAGE_TRANSITION_BLOCKED, history::SOURCE_BROWSED, + ui::PAGE_TRANSITION_BLOCKED, history::SOURCE_BROWSED, false); // Add the entry to the history database. diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.h b/chrome/browser/supervised_user/supervised_user_navigation_observer.h index a78c19c..412e5a7 100644 --- a/chrome/browser/supervised_user/supervised_user_navigation_observer.h +++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.h @@ -54,7 +54,7 @@ class SupervisedUserNavigationObserver virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; void OnRequestBlockedInternal(const GURL& url); diff --git a/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc index d8d8a4a..ba101a8 100644 --- a/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc +++ b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc @@ -66,7 +66,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserResourceThrottleTest, NavigationController& controller = web_contents->GetController(); content::TestNavigationObserver observer(web_contents.get()); controller.LoadURL(GURL("http://www.example.com"), content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); observer.Wait(); content::NavigationEntry* entry = controller.GetActiveEntry(); ASSERT_TRUE(entry); diff --git a/chrome/browser/sync/glue/session_sync_test_helper.cc b/chrome/browser/sync/glue/session_sync_test_helper.cc index d908288..9e241a9 100644 --- a/chrome/browser/sync/glue/session_sync_test_helper.cc +++ b/chrome/browser/sync/glue/session_sync_test_helper.cc @@ -86,7 +86,7 @@ void SessionSyncTestHelper::VerifySyncedSession( ASSERT_EQ(tab->navigations[0].title(), base::ASCIIToUTF16(kTitle)); ASSERT_EQ(tab->navigations[0].transition_type(), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); } } } diff --git a/chrome/browser/sync/glue/typed_url_change_processor.cc b/chrome/browser/sync/glue/typed_url_change_processor.cc index ae25e4f..90804d4 100644 --- a/chrome/browser/sync/glue/typed_url_change_processor.cc +++ b/chrome/browser/sync/glue/typed_url_change_processor.cc @@ -207,8 +207,8 @@ void TypedUrlChangeProcessor::HandleURLsVisited( bool TypedUrlChangeProcessor::ShouldSyncVisit( history::URLVisitedDetails* details) { int typed_count = details->row.typed_count(); - content::PageTransition transition = static_cast<content::PageTransition>( - details->transition & content::PAGE_TRANSITION_CORE_MASK); + ui::PageTransition transition = + ui::PageTransitionStripQualifier(details->transition); // Just use an ad-hoc criteria to determine whether to ignore this // notification. For most users, the distribution of visits is roughly a bell @@ -217,7 +217,7 @@ bool TypedUrlChangeProcessor::ShouldSyncVisit( // suggestions. But there are relatively few URLs with > 10 visits, and those // tend to be more broadly distributed such that there's no need to sync up // every visit to preserve their relative ordering. - return (transition == content::PAGE_TRANSITION_TYPED && + return (transition == ui::PAGE_TRANSITION_TYPED && typed_count > 0 && (typed_count < kTypedUrlVisitThrottleThreshold || (typed_count % kTypedUrlVisitThrottleMultiple) == 0)); diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc index 30fc427..376c5ec 100644 --- a/chrome/browser/sync/glue/typed_url_model_associator.cc +++ b/chrome/browser/sync/glue/typed_url_model_associator.cc @@ -103,7 +103,7 @@ bool TypedUrlModelAssociator::FixupURLAndGetVisits( } history::VisitRow visit( - url->id(), url->last_visit(), 0, content::PAGE_TRANSITION_TYPED, 0); + url->id(), url->last_visit(), 0, ui::PAGE_TRANSITION_TYPED, 0); visits->push_back(visit); } @@ -634,7 +634,7 @@ TypedUrlModelAssociator::MergeResult TypedUrlModelAssociator::MergeUrls( different |= DIFF_LOCAL_VISITS_ADDED; new_visits->push_back(history::VisitInfo( node_time, - content::PageTransitionFromInt( + ui::PageTransitionFromInt( node.visit_transitions(node_visit_index)))); } // This visit is added to visits below. @@ -704,13 +704,13 @@ void TypedUrlModelAssociator::WriteToTypedUrlSpecifics( // Walk the passed-in visit vector and count the # of typed visits. for (history::VisitVector::const_iterator visit = visits.begin(); visit != visits.end(); ++visit) { - content::PageTransition transition = content::PageTransitionFromInt( - visit->transition & content::PAGE_TRANSITION_CORE_MASK); + ui::PageTransition transition = + ui::PageTransitionStripQualifier(visit->transition); // We ignore reload visits. - if (transition == content::PAGE_TRANSITION_RELOAD) + if (transition == ui::PAGE_TRANSITION_RELOAD) continue; ++total; - if (transition == content::PAGE_TRANSITION_TYPED) + if (transition == ui::PAGE_TRANSITION_TYPED) ++typed_count; } // We should have at least one typed visit. This can sometimes happen if @@ -730,20 +730,20 @@ void TypedUrlModelAssociator::WriteToTypedUrlSpecifics( for (history::VisitVector::const_iterator visit = visits.begin(); visit != visits.end(); ++visit) { - content::PageTransition transition = content::PageTransitionFromInt( - visit->transition & content::PAGE_TRANSITION_CORE_MASK); + ui::PageTransition transition = + ui::PageTransitionStripQualifier(visit->transition); // Skip reload visits. - if (transition == content::PAGE_TRANSITION_RELOAD) + if (transition == ui::PAGE_TRANSITION_RELOAD) continue; // If we only have room for typed visits, then only add typed visits. - if (only_typed && transition != content::PAGE_TRANSITION_TYPED) + if (only_typed && transition != ui::PAGE_TRANSITION_TYPED) continue; if (skip_count > 0) { // We have too many entries to fit, so we need to skip the oldest ones. // Only skip typed URLs if there are too many typed URLs to fit. - if (only_typed || transition != content::PAGE_TRANSITION_TYPED) { + if (only_typed || transition != ui::PAGE_TRANSITION_TYPED) { --skip_count; continue; } @@ -760,7 +760,7 @@ void TypedUrlModelAssociator::WriteToTypedUrlSpecifics( // it's not legal to have an empty visit array (yet another workaround // for http://crbug.com/84258). typed_url->add_visits(url.last_visit().ToInternalValue()); - typed_url->add_visit_transitions(content::PAGE_TRANSITION_RELOAD); + typed_url->add_visit_transitions(ui::PAGE_TRANSITION_RELOAD); } CHECK_GT(typed_url->visits_size(), 0); CHECK_LE(typed_url->visits_size(), kMaxTypedUrlVisits); @@ -793,7 +793,7 @@ void TypedUrlModelAssociator::DiffVisits( } else if (old_visits[old_index].visit_time > new_visit_time) { new_visits->push_back(history::VisitInfo( new_visit_time, - content::PageTransitionFromInt( + ui::PageTransitionFromInt( new_url.visit_transitions(new_index)))); ++new_index; } else { @@ -811,7 +811,7 @@ void TypedUrlModelAssociator::DiffVisits( for ( ; new_index < new_visit_count; ++new_index) { new_visits->push_back(history::VisitInfo( base::Time::FromInternalValue(new_url.visits(new_index)), - content::PageTransitionFromInt(new_url.visit_transitions(new_index)))); + ui::PageTransitionFromInt(new_url.visit_transitions(new_index)))); } } diff --git a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc index 731b994..87c5742 100644 --- a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc +++ b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc @@ -39,7 +39,7 @@ class SyncTypedUrlModelAssociatorTest : public testing::Test { history_url.set_hidden(hidden); visits->push_back(history::VisitRow( history_url.id(), history_url.last_visit(), 0, - content::PAGE_TRANSITION_RELOAD, 0)); + ui::PAGE_TRANSITION_RELOAD, 0)); history_url.set_visit_count(visits->size()); return history_url; } @@ -53,7 +53,7 @@ class SyncTypedUrlModelAssociatorTest : public testing::Test { typed_url.set_title(title); typed_url.set_hidden(hidden); typed_url.add_visits(last_visit); - typed_url.add_visit_transitions(content::PAGE_TRANSITION_TYPED); + typed_url.add_visit_transitions(ui::PAGE_TRANSITION_TYPED); return typed_url; } @@ -183,7 +183,7 @@ TEST_F(SyncTypedUrlModelAssociatorTest, MergeUrlsAfterExpiration) { // First, create a history row that has two visits, with timestamps 2 and 3. history::VisitVector(history_visits); history_visits.push_back(history::VisitRow( - 0, base::Time::FromInternalValue(2), 0, content::PAGE_TRANSITION_TYPED, + 0, base::Time::FromInternalValue(2), 0, ui::PAGE_TRANSITION_TYPED, 0)); history::URLRow history_url(MakeTypedUrlRow("http://pie.com/", "pie", 2, 3, false, &history_visits)); @@ -225,9 +225,9 @@ TEST_F(SyncTypedUrlModelAssociatorTest, DiffVisitsSame) { for (size_t c = 0; c < arraysize(visits); ++c) { old_visits.push_back(history::VisitRow( 0, base::Time::FromInternalValue(visits[c]), 0, - content::PAGE_TRANSITION_TYPED, 0)); + ui::PAGE_TRANSITION_TYPED, 0)); new_url.add_visits(visits[c]); - new_url.add_visit_transitions(content::PAGE_TRANSITION_TYPED); + new_url.add_visit_transitions(ui::PAGE_TRANSITION_TYPED); } std::vector<history::VisitInfo> new_visits; @@ -255,12 +255,12 @@ TEST_F(SyncTypedUrlModelAssociatorTest, DiffVisitsRemove) { for (size_t c = 0; c < arraysize(visits_left); ++c) { old_visits.push_back(history::VisitRow( 0, base::Time::FromInternalValue(visits_left[c]), 0, - content::PAGE_TRANSITION_TYPED, 0)); + ui::PAGE_TRANSITION_TYPED, 0)); } for (size_t c = 0; c < arraysize(visits_right); ++c) { new_url.add_visits(visits_right[c]); - new_url.add_visit_transitions(content::PAGE_TRANSITION_TYPED); + new_url.add_visit_transitions(ui::PAGE_TRANSITION_TYPED); } std::vector<history::VisitInfo> new_visits; @@ -289,12 +289,12 @@ TEST_F(SyncTypedUrlModelAssociatorTest, DiffVisitsAdd) { for (size_t c = 0; c < arraysize(visits_left); ++c) { old_visits.push_back(history::VisitRow( 0, base::Time::FromInternalValue(visits_left[c]), 0, - content::PAGE_TRANSITION_TYPED, 0)); + ui::PAGE_TRANSITION_TYPED, 0)); } for (size_t c = 0; c < arraysize(visits_right); ++c) { new_url.add_visits(visits_right[c]); - new_url.add_visit_transitions(content::PAGE_TRANSITION_TYPED); + new_url.add_visit_transitions(ui::PAGE_TRANSITION_TYPED); } std::vector<history::VisitInfo> new_visits; @@ -307,11 +307,11 @@ TEST_F(SyncTypedUrlModelAssociatorTest, DiffVisitsAdd) { for (size_t c = 0; c < arraysize(visits_added); ++c) { EXPECT_EQ(new_visits[c].first.ToInternalValue(), visits_added[c]); - EXPECT_EQ(new_visits[c].second, content::PAGE_TRANSITION_TYPED); + EXPECT_EQ(new_visits[c].second, ui::PAGE_TRANSITION_TYPED); } } -static history::VisitRow CreateVisit(content::PageTransition type, +static history::VisitRow CreateVisit(ui::PageTransition type, int64 timestamp) { return history::VisitRow(0, base::Time::FromInternalValue(timestamp), 0, type, 0); @@ -319,9 +319,9 @@ static history::VisitRow CreateVisit(content::PageTransition type, TEST_F(SyncTypedUrlModelAssociatorTest, WriteTypedUrlSpecifics) { history::VisitVector visits; - visits.push_back(CreateVisit(content::PAGE_TRANSITION_TYPED, 1)); - visits.push_back(CreateVisit(content::PAGE_TRANSITION_RELOAD, 2)); - visits.push_back(CreateVisit(content::PAGE_TRANSITION_LINK, 3)); + visits.push_back(CreateVisit(ui::PAGE_TRANSITION_TYPED, 1)); + visits.push_back(CreateVisit(ui::PAGE_TRANSITION_RELOAD, 2)); + visits.push_back(CreateVisit(ui::PAGE_TRANSITION_LINK, 3)); history::URLRow url(MakeTypedUrlRow("http://pie.com/", "pie", 1, 100, false, &visits)); @@ -332,18 +332,18 @@ TEST_F(SyncTypedUrlModelAssociatorTest, WriteTypedUrlSpecifics) { EXPECT_EQ(typed_url.visit_transitions_size(), typed_url.visits_size()); EXPECT_EQ(1, typed_url.visits(0)); EXPECT_EQ(3, typed_url.visits(1)); - EXPECT_EQ(content::PAGE_TRANSITION_TYPED, - static_cast<content::PageTransition>(typed_url.visit_transitions(0))); - EXPECT_EQ(content::PAGE_TRANSITION_LINK, - static_cast<content::PageTransition>(typed_url.visit_transitions(1))); + EXPECT_EQ(ui::PAGE_TRANSITION_TYPED, + ui::PageTransitionFromInt(typed_url.visit_transitions(0))); + EXPECT_EQ(ui::PAGE_TRANSITION_LINK, + ui::PageTransitionFromInt(typed_url.visit_transitions(1))); } TEST_F(SyncTypedUrlModelAssociatorTest, TooManyVisits) { history::VisitVector visits; int64 timestamp = 1000; - visits.push_back(CreateVisit(content::PAGE_TRANSITION_TYPED, timestamp++)); + visits.push_back(CreateVisit(ui::PAGE_TRANSITION_TYPED, timestamp++)); for (int i = 0 ; i < 100; ++i) { - visits.push_back(CreateVisit(content::PAGE_TRANSITION_LINK, timestamp++)); + visits.push_back(CreateVisit(ui::PAGE_TRANSITION_LINK, timestamp++)); } history::URLRow url(MakeTypedUrlRow("http://pie.com/", "pie", 1, timestamp++, false, &visits)); @@ -356,19 +356,19 @@ TEST_F(SyncTypedUrlModelAssociatorTest, TooManyVisits) { // Visit with timestamp of 1001 should be omitted since we should have // skipped that visit to stay under the cap. EXPECT_EQ(1002, typed_url.visits(1)); - EXPECT_EQ(content::PAGE_TRANSITION_TYPED, - static_cast<content::PageTransition>(typed_url.visit_transitions(0))); - EXPECT_EQ(content::PAGE_TRANSITION_LINK, - static_cast<content::PageTransition>(typed_url.visit_transitions(1))); + EXPECT_EQ(ui::PAGE_TRANSITION_TYPED, + ui::PageTransitionFromInt(typed_url.visit_transitions(0))); + EXPECT_EQ(ui::PAGE_TRANSITION_LINK, + ui::PageTransitionFromInt(typed_url.visit_transitions(1))); } TEST_F(SyncTypedUrlModelAssociatorTest, TooManyTypedVisits) { history::VisitVector visits; int64 timestamp = 1000; for (int i = 0 ; i < 102; ++i) { - visits.push_back(CreateVisit(content::PAGE_TRANSITION_TYPED, timestamp++)); - visits.push_back(CreateVisit(content::PAGE_TRANSITION_LINK, timestamp++)); - visits.push_back(CreateVisit(content::PAGE_TRANSITION_RELOAD, timestamp++)); + visits.push_back(CreateVisit(ui::PAGE_TRANSITION_TYPED, timestamp++)); + visits.push_back(CreateVisit(ui::PAGE_TRANSITION_LINK, timestamp++)); + visits.push_back(CreateVisit(ui::PAGE_TRANSITION_RELOAD, timestamp++)); } history::URLRow url(MakeTypedUrlRow("http://pie.com/", "pie", 1, timestamp++, false, &visits)); @@ -382,8 +382,8 @@ TEST_F(SyncTypedUrlModelAssociatorTest, TooManyTypedVisits) { // Ensure there are no non-typed visits since that's all that should fit. for (int i = 0; i < typed_url.visits_size(); ++i) { - EXPECT_EQ(content::PAGE_TRANSITION_TYPED, - static_cast<content::PageTransition>(typed_url.visit_transitions(i))); + EXPECT_EQ(ui::PAGE_TRANSITION_TYPED, + ui::PageTransitionFromInt(typed_url.visit_transitions(i))); } } @@ -399,8 +399,8 @@ TEST_F(SyncTypedUrlModelAssociatorTest, NoTypedVisits) { EXPECT_EQ(typed_url.visit_transitions_size(), typed_url.visits_size()); // First two typed visits should be skipped. EXPECT_EQ(1000, typed_url.visits(0)); - EXPECT_EQ(content::PAGE_TRANSITION_RELOAD, - static_cast<content::PageTransition>(typed_url.visit_transitions(0))); + EXPECT_EQ(ui::PAGE_TRANSITION_RELOAD, + ui::PageTransitionFromInt(typed_url.visit_transitions(0))); } // This test verifies that we can abort model association from the UI thread. diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc index 1a2e241..2fe0476 100644 --- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc @@ -352,7 +352,7 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest { history_url.set_hidden(hidden); visits->push_back(history::VisitRow( history_url.id(), history_url.last_visit(), 0, - content::PAGE_TRANSITION_TYPED, 0)); + ui::PAGE_TRANSITION_TYPED, 0)); history_url.set_visit_count(visits->size()); return history_url; } @@ -372,7 +372,7 @@ void AddTypedUrlEntries(ProfileSyncServiceTypedUrlTest* test, history::VisitVector visits; visits.push_back(history::VisitRow( entries[i].id(), entries[i].last_visit(), 0, - content::PageTransitionFromInt(0), 0)); + ui::PageTransitionFromInt(0), 0)); test->AddTypedUrlSyncNode(entries[i], visits); } } @@ -527,7 +527,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, HasNativeHasSyncMerge) { history::VisitVector merged_visits; merged_visits.push_back(history::VisitRow( sync_entry.id(), base::Time::FromInternalValue(15), 0, - content::PageTransitionFromInt(0), 0)); + ui::PageTransitionFromInt(0), 0)); history::URLRow merged_entry(MakeTypedUrlEntry("http://native.com", "name", 2, 17, false, &merged_visits)); @@ -704,7 +704,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeAddFromVisit) { history::URLVisitedDetails details; details.row = added_entry; - details.transition = content::PAGE_TRANSITION_TYPED; + details.transition = ui::PAGE_TRANSITION_TYPED; scoped_refptr<ThreadNotifier> notifier( new ThreadNotifier(history_thread_.get())); notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED, @@ -743,7 +743,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeUpdateFromVisit) { history::URLVisitedDetails details; details.row = updated_entry; - details.transition = content::PAGE_TRANSITION_TYPED; + details.transition = ui::PAGE_TRANSITION_TYPED; scoped_refptr<ThreadNotifier> notifier( new ThreadNotifier(history_thread_.get())); notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED, @@ -784,7 +784,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) { details.row = updated_entry; // Should ignore this change because it's not TYPED. - details.transition = content::PAGE_TRANSITION_RELOAD; + details.transition = ui::PAGE_TRANSITION_RELOAD; scoped_refptr<ThreadNotifier> notifier( new ThreadNotifier(history_thread_.get())); notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED, @@ -803,7 +803,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) { 12, 15, false, &updated_visits)); details.row = twelve_visits; - details.transition = content::PAGE_TRANSITION_TYPED; + details.transition = ui::PAGE_TRANSITION_TYPED; notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED, content::Source<Profile>(profile_), content::Details<history::URLVisitedDetails>(&details)); @@ -818,7 +818,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) { 20, 15, false, &updated_visits)); details.row = twenty_visits; - details.transition = content::PAGE_TRANSITION_TYPED; + details.transition = ui::PAGE_TRANSITION_TYPED; notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED, content::Source<Profile>(profile_), content::Details<history::URLVisitedDetails>(&details)); diff --git a/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc index bf86df5..5366f32 100644 --- a/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc @@ -69,7 +69,7 @@ void SessionsSyncPerfTest::UpdateTabs(int profile) { content::Referrer(GURL("http://localhost"), blink::WebReferrerPolicyDefault), CURRENT_TAB, - content::PageTransitionFromInt(0), false)); + ui::PAGE_TRANSITION_LINK, false)); urls.push_back(url); } WaitForTabsToLoad(profile, urls); diff --git a/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc index c754985..1aa615e 100644 --- a/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc @@ -100,7 +100,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, DeleteNonTyped) { GURL new_url(kSanityHistoryUrl); // Add a non-typed URL. - AddUrlToHistoryWithTransition(0, new_url, content::PAGE_TRANSITION_LINK, + AddUrlToHistoryWithTransition(0, new_url, ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED); urls = GetTypedUrlsFromClient(0); diff --git a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc index b783a09..bdbf16b 100644 --- a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc @@ -100,7 +100,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, AddExpired) { base::Time timestamp = base::Time::Now() - base::TimeDelta::FromDays(365); AddUrlToHistoryWithTimestamp(0, new_url, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, timestamp); history::URLRows urls = GetTypedUrlsFromClient(0); @@ -132,7 +132,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, MAYBE_AddExpiredThenUpdate) { base::Time timestamp = base::Time::Now() - base::TimeDelta::FromDays(365); AddUrlToHistoryWithTimestamp(0, new_url, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, timestamp); std::vector<history::URLRow> urls = GetTypedUrlsFromClient(0); @@ -279,11 +279,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, // Then add a typed URL to the second client - this test makes sure that // we properly merge both sets of visits together to end up with the same // set of visits on both ends. - AddUrlToHistoryWithTimestamp(0, new_url, content::PAGE_TRANSITION_LINK, + AddUrlToHistoryWithTimestamp(0, new_url, ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, timestamp); - AddUrlToHistoryWithTimestamp(1, new_url, content::PAGE_TRANSITION_LINK, + AddUrlToHistoryWithTimestamp(1, new_url, ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, timestamp); - AddUrlToHistoryWithTimestamp(1, new_url, content::PAGE_TRANSITION_TYPED, + AddUrlToHistoryWithTimestamp(1, new_url, ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, timestamp + base::TimeDelta::FromSeconds(1)); @@ -316,9 +316,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, // Setup both clients with the identical typed URL visit. This means we can't // use the verifier in this test, because this will show up as two distinct // visits in the verifier. - AddUrlToHistoryWithTimestamp(0, new_url, content::PAGE_TRANSITION_LINK, + AddUrlToHistoryWithTimestamp(0, new_url, ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, timestamp); - AddUrlToHistoryWithTimestamp(1, new_url, content::PAGE_TRANSITION_LINK, + AddUrlToHistoryWithTimestamp(1, new_url, ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, timestamp); // Now start up sync. Neither URL should get synced as they do not look like @@ -330,7 +330,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, ASSERT_EQ(0U, urls.size()); // Now, add a typed visit to the first client. - AddUrlToHistoryWithTimestamp(0, new_url, content::PAGE_TRANSITION_TYPED, + AddUrlToHistoryWithTimestamp(0, new_url, ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, timestamp + base::TimeDelta::FromSeconds(1)); @@ -352,7 +352,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, UpdateToNonTypedURL) { // Populate one client with a non-typed URL, should not be synced. GURL new_url(kHistoryUrl); - AddUrlToHistoryWithTransition(0, new_url, content::PAGE_TRANSITION_LINK, + AddUrlToHistoryWithTransition(0, new_url, ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED); history::URLRows urls = GetTypedUrlsFromClient(0); ASSERT_EQ(0U, urls.size()); @@ -387,13 +387,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, // Create 3 items in our first client - 1 imported, one browsed, one with // both imported and browsed entries. AddUrlToHistoryWithTransition(0, imported_url, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_FIREFOX_IMPORTED); AddUrlToHistoryWithTransition(0, browsed_url, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED); AddUrlToHistoryWithTransition(0, browsed_and_imported_url, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_FIREFOX_IMPORTED); ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; @@ -405,7 +405,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, // Now browse to 3rd URL - this should cause it to be synced, even though it // was initially imported. AddUrlToHistoryWithTransition(0, browsed_and_imported_url, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED); ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); urls = GetTypedUrlsFromClient(1); diff --git a/chrome/browser/sync/test/integration/typed_urls_helper.cc b/chrome/browser/sync/test/integration/typed_urls_helper.cc index 01f5b94..027a6fc 100644 --- a/chrome/browser/sync/test/integration/typed_urls_helper.cc +++ b/chrome/browser/sync/test/integration/typed_urls_helper.cc @@ -156,7 +156,7 @@ void WaitForHistoryDBThread(int index) { // type. void AddToHistory(HistoryService* service, const GURL& url, - content::PageTransition transition, + ui::PageTransition transition, history::VisitSource source, const base::Time& timestamp) { service->AddPage(url, @@ -263,19 +263,19 @@ base::Time GetTimestamp() { } void AddUrlToHistory(int index, const GURL& url) { - AddUrlToHistoryWithTransition(index, url, content::PAGE_TRANSITION_TYPED, + AddUrlToHistoryWithTransition(index, url, ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED); } void AddUrlToHistoryWithTransition(int index, const GURL& url, - content::PageTransition transition, + ui::PageTransition transition, history::VisitSource source) { base::Time timestamp = GetTimestamp(); AddUrlToHistoryWithTimestamp(index, url, transition, source, timestamp); } void AddUrlToHistoryWithTimestamp(int index, const GURL& url, - content::PageTransition transition, + ui::PageTransition transition, history::VisitSource source, const base::Time& timestamp) { AddToHistory(HistoryServiceFactory::GetForProfileWithoutCreating( diff --git a/chrome/browser/sync/test/integration/typed_urls_helper.h b/chrome/browser/sync/test/integration/typed_urls_helper.h index d057953..429b96c 100644 --- a/chrome/browser/sync/test/integration/typed_urls_helper.h +++ b/chrome/browser/sync/test/integration/typed_urls_helper.h @@ -8,7 +8,7 @@ #include <vector> #include "chrome/browser/history/history_types.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" namespace base { class Time; @@ -37,7 +37,7 @@ void AddUrlToHistory(int index, const GURL& url); // new visit if the URL already exists), using the passed PageTransition. void AddUrlToHistoryWithTransition(int index, const GURL& url, - content::PageTransition transition, + ui::PageTransition transition, history::VisitSource source); // Adds a URL to the history DB for a specific sync profile (just registers a @@ -45,7 +45,7 @@ void AddUrlToHistoryWithTransition(int index, // timestamp. void AddUrlToHistoryWithTimestamp(int index, const GURL& url, - content::PageTransition transition, + ui::PageTransition transition, history::VisitSource source, const base::Time& timestamp); diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 5552771..700456e 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -1530,7 +1530,7 @@ void TaskManager::OpenAboutMemory(chrome::HostDesktopType desktop_type) { chrome::NavigateParams params( ProfileManager::GetLastUsedProfileAllowedByPolicy(), GURL(chrome::kChromeUIMemoryURL), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; params.host_desktop_type = desktop_type; chrome::Navigate(¶ms); diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 8100f86..217b5f2 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -36,7 +36,6 @@ #include "components/infobars/core/infobar.h" #include "content/public/browser/notification_service.h" #include "content/public/common/content_switches.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_utils.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" @@ -44,6 +43,7 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" using content::WebContents; using task_manager::browsertest_util::MatchAboutBlankTab; @@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) { ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchTab("title1.html"))); // Open a new tab and make sure the task manager notices it. - AddTabAtIndex(0, GetTestURL(), content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GetTestURL(), ui::PAGE_TRANSITION_TYPED); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html"))); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); @@ -149,7 +149,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillTab) { ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchTab("title1.html"))); // Open a new tab and make sure the task manager notices it. - AddTabAtIndex(0, GetTestURL(), content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GetTestURL(), ui::PAGE_TRANSITION_TYPED); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html"))); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); @@ -380,7 +380,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionTabChanges) { // The fourth entry (page.html) is also of type extension and has both a // WebContents and an extension. The title should start with "Extension:". GURL url("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html"); - AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchExtension("Foobar"))); ASSERT_NO_FATAL_FAILURE( WaitForTaskManagerRows(1, MatchExtension("My extension 1"))); @@ -410,7 +410,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionTab) { .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj") .AppendASCII("1.0.0.0"))); GURL url("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html"); - AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); ShowTaskManager(); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchExtension("Foobar"))); @@ -447,7 +447,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabChanges) { // Open a new tab to the app's launch URL and make sure we notice that. GURL url(extension->GetResourceURL("main.html")); - AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); // There should be 1 "App: " tab and the original new tab page. ASSERT_NO_FATAL_FAILURE( @@ -487,7 +487,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTab) { // Open a new tab to the app's launch URL and make sure we notice that. GURL url(extension->GetResourceURL("main.html")); - AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); ShowTaskManager(); @@ -526,7 +526,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabChanges) { content::WindowedNotificationObserver observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); - AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); observer.Wait(); // Check that the new entry's title starts with "Tab:". @@ -591,7 +591,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabAfterReload) { content::WindowedNotificationObserver observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); - AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); observer.Wait(); // Load the hosted app and make sure it still starts with "Tab:", @@ -627,7 +627,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabBeforeReload) { content::WindowedNotificationObserver observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); - AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); observer.Wait(); // Load the hosted app and make sure it still starts with "Tab:", @@ -676,7 +676,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, int resource_count = TaskManager::GetInstance()->model()->ResourceCount(); // Open a new tab and make sure we notice that. - AddTabAtIndex(0, GetTestURL(), content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GetTestURL(), ui::PAGE_TRANSITION_TYPED); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); // Check that we get some value for the cache columns. diff --git a/chrome/browser/translate/chrome_translate_client.cc b/chrome/browser/translate/chrome_translate_client.cc index 16b384e..9356f44 100644 --- a/chrome/browser/translate/chrome_translate_client.cc +++ b/chrome/browser/translate/chrome_translate_client.cc @@ -260,7 +260,7 @@ void ChromeTranslateClient::ShowReportLanguageDetectionErrorUI( } chrome::AddSelectedTabWithURL( - browser, report_url, content::PAGE_TRANSITION_AUTO_BOOKMARK); + browser, report_url, ui::PAGE_TRANSITION_AUTO_BOOKMARK); #endif // defined(OS_ANDROID) } diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc index 2566d76..135536c 100644 --- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc +++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc @@ -839,9 +839,9 @@ TEST_F(TranslateManagerRenderViewHostTest, ReloadFromLocationBar) { // equivalent of typing the URL again in the location bar. NavEntryCommittedObserver nav_observer(web_contents()); web_contents()->GetController().LoadURL( - url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); + url, content::Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); rvh_tester()->SendNavigateWithTransition( - 0, url, content::PAGE_TRANSITION_TYPED); + 0, url, ui::PAGE_TRANSITION_TYPED); // Test that we are really getting a same page navigation, the test would be // useless if it was not the case. @@ -894,12 +894,12 @@ TEST_F(TranslateManagerRenderViewHostTest, CloseInfoBarInSubframeNavigation) { // Simulate a sub-frame auto-navigating. subframe_tester->SendNavigateWithTransition( - 1, GURL("http://pub.com"), content::PAGE_TRANSITION_AUTO_SUBFRAME); + 1, GURL("http://pub.com"), ui::PAGE_TRANSITION_AUTO_SUBFRAME); EXPECT_TRUE(GetTranslateInfoBar() == NULL); // Simulate the user navigating in a sub-frame. subframe_tester->SendNavigateWithTransition( - 2, GURL("http://pub.com"), content::PAGE_TRANSITION_MANUAL_SUBFRAME); + 2, GURL("http://pub.com"), ui::PAGE_TRANSITION_MANUAL_SUBFRAME); EXPECT_TRUE(GetTranslateInfoBar() == NULL); // Navigate out of page, a new infobar should show. diff --git a/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc b/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc index fe94a79..0256d2a 100644 --- a/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc +++ b/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc @@ -98,7 +98,7 @@ void AutoLoginInfoBarDelegateAndroid::LoginSuccess(JNIEnv* env, // WARNING: |this| may be deleted at this point! Do not access any members! contents->OpenURL(content::OpenURLParams( GURL(base::android::ConvertJavaStringToUTF8(env, result)), - content::Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK, + content::Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_AUTO_BOOKMARK, false)); } diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate.cc b/chrome/browser/ui/app_list/app_list_controller_delegate.cc index 205e0ec..83f94f7 100644 --- a/chrome/browser/ui/app_list/app_list_controller_delegate.cc +++ b/chrome/browser/ui/app_list/app_list_controller_delegate.cc @@ -149,7 +149,7 @@ void AppListControllerDelegate::ShowAppInWebStore( net::AppendQueryParameter(url, extension_urls::kWebstoreSourceField, source), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); chrome::Navigate(¶ms); } @@ -171,7 +171,7 @@ void AppListControllerDelegate::ShowOptionsPage( chrome::NavigateParams params( profile, extensions::OptionsPageInfo::GetOptionsPage(extension), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); chrome::Navigate(¶ms); } diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc index d924ce6..af012b2 100644 --- a/chrome/browser/ui/app_list/app_list_view_delegate.cc +++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc @@ -492,7 +492,7 @@ void AppListViewDelegate::OpenHelp() { content::OpenURLParams params(GURL(chrome::kAppLauncherHelpURL), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); displayer.browser()->OpenURL(params); } diff --git a/chrome/browser/ui/app_list/search/people/people_result.cc b/chrome/browser/ui/app_list/search/people/people_result.cc index 3531f64..57ae19f 100644 --- a/chrome/browser/ui/app_list/search/people/people_result.cc +++ b/chrome/browser/ui/app_list/search/people/people_result.cc @@ -174,7 +174,7 @@ void PeopleResult::OpenChat() { void PeopleResult::SendEmail() { chrome::NavigateParams params(profile_, GURL(kEmailUrlPrefix + person_->email), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); // If no window exists, this will open a new window this one tab. params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); diff --git a/chrome/browser/ui/app_list/search/search_webstore_result.cc b/chrome/browser/ui/app_list/search/search_webstore_result.cc index a979da6..fa5f1b5 100644 --- a/chrome/browser/ui/app_list/search/search_webstore_result.cc +++ b/chrome/browser/ui/app_list/search/search_webstore_result.cc @@ -49,7 +49,7 @@ void SearchWebstoreResult::Open(int event_flags) { chrome::NavigateParams params(profile_, store_url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); params.disposition = ui::DispositionFromEventFlags(event_flags); chrome::Navigate(¶ms); } diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_result.cc b/chrome/browser/ui/app_list/search/webstore/webstore_result.cc index f99e436..6b3d25b 100644 --- a/chrome/browser/ui/app_list/search/webstore/webstore_result.cc +++ b/chrome/browser/ui/app_list/search/webstore/webstore_result.cc @@ -112,7 +112,7 @@ void WebstoreResult::Open(int event_flags) { chrome::NavigateParams params(profile_, store_url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); params.disposition = ui::DispositionFromEventFlags(event_flags); chrome::Navigate(¶ms); } diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc index 8392be2..1f0bb9d 100644 --- a/chrome/browser/ui/app_list/start_page_service.cc +++ b/chrome/browser/ui/app_list/start_page_service.cc @@ -244,7 +244,7 @@ void StartPageService::LoadContents() { contents_->GetController().LoadURL( url, content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc index dd7a47d..f616847 100644 --- a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc @@ -57,7 +57,7 @@ void ChromeNewWindowDelegateChromeos::OpenCrosh() { content::OpenURLParams(crosh_url, content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_GENERATED, + ui::PAGE_TRANSITION_GENERATED, false)); browser->window()->Show(); browser->window()->Activate(); diff --git a/chrome/browser/ui/auto_login_infobar_delegate.cc b/chrome/browser/ui/auto_login_infobar_delegate.cc index b0d854d..18bc3fa 100644 --- a/chrome/browser/ui/auto_login_infobar_delegate.cc +++ b/chrome/browser/ui/auto_login_infobar_delegate.cc @@ -118,7 +118,7 @@ void AutoLoginRedirector::RedirectToMergeSession(const std::string& token) { web_contents()->GetController().LoadURL( GaiaUrls::GetInstance()->merge_session_url().Resolve( "?source=chrome&uberauth=" + token + "&" + args_), - content::Referrer(), content::PAGE_TRANSITION_AUTO_BOOKMARK, + content::Referrer(), ui::PAGE_TRANSITION_AUTO_BOOKMARK, std::string()); } diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc index 2585987..4dba69f 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc @@ -52,7 +52,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/content_switches.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" @@ -62,6 +61,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebInputEvent.h" +#include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" #include "url/gurl.h" @@ -1200,7 +1200,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, SimulateSuccessfulSignIn) { content::OpenURLParams params(wallet::GetSignInContinueUrl(), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, true); sign_in_contents->GetDelegate()->OpenURLFromTab(sign_in_contents, params); @@ -1277,7 +1277,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, AddAccount) { content::OpenURLParams params(wallet::GetSignInContinueUrl(), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, true); sign_in_contents->GetDelegate()->OpenURLFromTab(sign_in_contents, params); @@ -1421,7 +1421,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, content::OpenURLParams params(GURL("http://google.com"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, true); params.user_gesture = true; diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc index 1152179..7e0c35c 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc @@ -2913,7 +2913,7 @@ void AutofillDialogControllerImpl::OpenTabWithUrl(const GURL& url) { chrome::NavigateParams params( chrome::FindBrowserWithWebContents(web_contents()), url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); } diff --git a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.cc b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.cc index 5eef3e9..dcfdba88 100644 --- a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.cc +++ b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.cc @@ -92,10 +92,10 @@ void GeneratedCreditCardBubbleController::DidNavigateMainFrame( // Don't destory the bubble due to reloads, form submits, or redirects right // after the dialog succeeds. Merchants often navigate to a confirmation page. - content::PageTransition transition = details.entry->GetTransitionType(); - if (transition == content::PAGE_TRANSITION_FORM_SUBMIT || - transition == content::PAGE_TRANSITION_RELOAD || - content::PageTransitionIsRedirect(transition)) { + ui::PageTransition transition = details.entry->GetTransitionType(); + if (transition == ui::PAGE_TRANSITION_FORM_SUBMIT || + transition == ui::PAGE_TRANSITION_RELOAD || + ui::PageTransitionIsRedirect(transition)) { return; } @@ -138,7 +138,7 @@ void GeneratedCreditCardBubbleController::OnLinkClicked() { chrome::NavigateParams params( chrome::FindBrowserWithWebContents(web_contents()), GURL(kWalletGeneratedCardLearnMoreLink), - content::PAGE_TRANSITION_AUTO_BOOKMARK); + ui::PAGE_TRANSITION_AUTO_BOOKMARK); params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); diff --git a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc index d52aff5..de08c51 100644 --- a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc +++ b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc @@ -16,10 +16,10 @@ #include "chrome/test/base/testing_profile.h" #include "components/autofill/core/browser/autofill_test_utils.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/web_contents_tester.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" #include "ui/gfx/range/range.h" #if defined(OS_WIN) @@ -76,7 +76,7 @@ class GeneratedCreditCardBubbleControllerTest : public testing::Test { BackingCard()); } - void NavigateWithTransition(content::PageTransition trans) { + void NavigateWithTransition(ui::PageTransition trans) { content::WebContentsTester::For(test_web_contents_.get())->TestDidNavigate( test_web_contents_->GetMainFrame(), 1, GURL("about:blank"), trans); } @@ -156,7 +156,7 @@ TEST_F(GeneratedCreditCardBubbleControllerTest, HideOnLinkClick) { EXPECT_TRUE(controller()->GetTestingBubble()->showing()); // However, if the user clicks a link the bubble should hide. - NavigateWithTransition(content::PAGE_TRANSITION_LINK); + NavigateWithTransition(ui::PAGE_TRANSITION_LINK); EXPECT_FALSE(controller()); } @@ -167,9 +167,9 @@ TEST_F(GeneratedCreditCardBubbleControllerTest, StayOnSomeNavigations) { // If the user reloads or the page redirects or submits a form, the bubble // should stay showing. - NavigateWithTransition(content::PAGE_TRANSITION_CLIENT_REDIRECT); - NavigateWithTransition(content::PAGE_TRANSITION_FORM_SUBMIT); - NavigateWithTransition(content::PAGE_TRANSITION_RELOAD); + NavigateWithTransition(ui::PAGE_TRANSITION_CLIENT_REDIRECT); + NavigateWithTransition(ui::PAGE_TRANSITION_FORM_SUBMIT); + NavigateWithTransition(ui::PAGE_TRANSITION_RELOAD); EXPECT_TRUE(controller()->GetTestingBubble()->showing()); } diff --git a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc index 1f4ae7a..c2f7fc6 100644 --- a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc +++ b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc @@ -217,7 +217,7 @@ void PasswordGenerationPopupControllerImpl::OnSavedPasswordsLinkClicked() { chrome::FindBrowserWithWebContents(controller_common_.web_contents()); content::OpenURLParams params( GURL(chrome::kPasswordManagerAccountDashboardURL), content::Referrer(), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false); + NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false); browser->OpenURL(params); } diff --git a/chrome/browser/ui/blocked_content/blocked_window_params.cc b/chrome/browser/ui/blocked_content/blocked_window_params.cc index f3641a2..c26a42b 100644 --- a/chrome/browser/ui/blocked_content/blocked_window_params.cc +++ b/chrome/browser/ui/blocked_content/blocked_window_params.cc @@ -37,7 +37,7 @@ chrome::NavigateParams BlockedWindowParams::CreateNavigateParams( chrome::NavigateParams nav_params( Profile::FromBrowserContext(web_contents->GetBrowserContext()), popup_url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); nav_params.referrer = referrer_; nav_params.source_contents = web_contents; nav_params.is_renderer_initiated = true; diff --git a/chrome/browser/ui/bookmarks/bookmark_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_unittest.cc index 3e40038..0d150b7 100644 --- a/chrome/browser/ui/bookmarks/bookmark_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_unittest.cc @@ -27,7 +27,7 @@ TEST_F(BookmarkTest, DetachedBookmarkBarOnCustomNTP) { content::WebContents::CreateParams(browser()->profile())); web_contents->GetController().LoadURL(GURL(url::kAboutBlankURL), content::Referrer(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, std::string()); // Give it a NTP virtual URL. diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index c2216ba..2c56d5e 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc @@ -221,7 +221,7 @@ void OpenAll(gfx::NativeWindow parent, content::WebContents* opened_tab = navigator->OpenURL( content::OpenURLParams(*url, content::Referrer(), disposition, - content::PAGE_TRANSITION_AUTO_BOOKMARK, false)); + ui::PAGE_TRANSITION_AUTO_BOOKMARK, false)); if (!opened_first_url) { opened_first_url = true; diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 0525e02..e26600a 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -861,7 +861,7 @@ void Browser::UpdateDownloadShelfVisibility(bool visible) { /////////////////////////////////////////////////////////////////////////////// void Browser::UpdateUIForNavigationInTab(WebContents* contents, - content::PageTransition transition, + ui::PageTransition transition, bool user_initiated) { tab_strip_model_->TabNavigating(contents, transition); @@ -1836,7 +1836,7 @@ void Browser::NavigateOnThumbnailClick(const GURL& url, // TODO(kmadhusu): Page transitions to privileged destinations should be // marked as "LINK" instead of "AUTO_BOOKMARK"? chrome::NavigateParams params(this, url, - content::PAGE_TRANSITION_AUTO_BOOKMARK); + ui::PAGE_TRANSITION_AUTO_BOOKMARK); params.referrer = content::Referrer(); params.source_contents = source_contents; params.disposition = disposition; @@ -1931,7 +1931,7 @@ void Browser::FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info, return; OpenURL(OpenURLParams( - url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); + url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); } /////////////////////////////////////////////////////////////////////////////// @@ -2478,7 +2478,7 @@ bool Browser::MaybeCreateBackgroundContents( contents->web_contents()->GetController().LoadURL( target_url, content::Referrer(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, std::string()); // No extra headers. } diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 02e343c..4ae9ee6 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -37,8 +37,8 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents_delegate.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/page_zoom.h" +#include "ui/base/page_transition_types.h" #include "ui/base/ui_base_types.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/rect.h" @@ -393,7 +393,7 @@ class Browser : public TabStripModelObserver, // Called by chrome::Navigate() when a navigation has occurred in a tab in // this Browser. Updates the UI for the start of this navigation. void UpdateUIForNavigationInTab(content::WebContents* contents, - content::PageTransition transition, + ui::PageTransition transition, bool user_initiated); // Interface implementations //////////////////////////////////////////////// diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index f8fbb05..c86c59b 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -76,7 +76,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/frame_navigate_params.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/renderer_preferences.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" @@ -88,6 +87,7 @@ #include "net/dns/mock_host_resolver.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" @@ -419,7 +419,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, JavascriptAlertActivatesTab) { GURL url(ui_test_utils::GetTestUrl(base::FilePath( base::FilePath::kCurrentDirectory), base::FilePath(kTitle1File))); ui_test_utils::NavigateToURL(browser(), url); - AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); EXPECT_EQ(2, browser()->tab_strip_model()->count()); EXPECT_EQ(0, browser()->tab_strip_model()->active_index()); WebContents* second_tab = browser()->tab_strip_model()->GetWebContentsAt(1); @@ -454,7 +454,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_ThirtyFourTabs) { const int kTabCount = 34; for (int ix = 0; ix != (kTabCount - 1); ++ix) { chrome::AddSelectedTabWithURL(browser(), url, - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); } EXPECT_EQ(kTabCount, browser()->tab_strip_model()->count()); @@ -493,7 +493,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ClearPendingOnFailUnlessNTP) { content::Source<NavigationController>( &web_contents->GetController())); browser()->OpenURL(OpenURLParams(abort_url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); stop_observer.Wait(); EXPECT_TRUE(web_contents->GetController().GetPendingEntry()); EXPECT_EQ(abort_url, web_contents->GetVisibleURL()); @@ -511,7 +511,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ClearPendingOnFailUnlessNTP) { content::Source<NavigationController>( &web_contents->GetController())); browser()->OpenURL(OpenURLParams(abort_url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); stop_observer.Wait(); EXPECT_FALSE(web_contents->GetController().GetPendingEntry()); EXPECT_EQ(real_url, web_contents->GetVisibleURL()); @@ -696,8 +696,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NoStopDuringTransferUntilCommit) { EXPECT_EQ(2U, redirect_observer.params().redirects.size()); EXPECT_EQ(redirect_url, redirect_observer.params().redirects.at(0)); EXPECT_EQ(dest_url, redirect_observer.params().redirects.at(1)); - EXPECT_TRUE(PageTransitionCoreTypeIs(redirect_observer.params().transition, - content::PAGE_TRANSITION_TYPED)); + EXPECT_TRUE(ui::PageTransitionCoreTypeIs( + redirect_observer.params().transition, ui::PAGE_TRANSITION_TYPED)); } // Restore previous browser client. @@ -733,7 +733,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SingleBeforeUnloadAfterRedirect) { GURL redirect_url(test_server()->GetURL("server-redirect?" + https_url.spec())); browser()->OpenURL(OpenURLParams(redirect_url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); EXPECT_TRUE( static_cast<JavaScriptAppModalDialog*>(alert)->is_before_unload_dialog()); @@ -755,7 +755,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CancelBeforeUnloadResetsURL) { ASSERT_TRUE(test_server()->Start()); GURL url2(test_server()->GetURL("files/title1.html")); browser()->OpenURL(OpenURLParams( - url2, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); + url2, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); content::WindowedNotificationObserver host_destroyed_observer( content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED, @@ -830,7 +830,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_BeforeUnloadVsBeforeReload) { // Navigate to another url, and check that we get a "before unload" dialog. GURL url2(url::kAboutBlankURL); browser()->OpenURL(OpenURLParams( - url2, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); + url2, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); alert = ui_test_utils::WaitForAppModalDialog(); EXPECT_FALSE(static_cast<JavaScriptAppModalDialog*>(alert)->is_reload()); @@ -1184,7 +1184,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) { ASSERT_EQ(1, browser()->tab_strip_model()->count()); WebContents* initial_tab = browser()->tab_strip_model()->GetWebContentsAt(0); WebContents* app_tab = chrome::AddSelectedTabWithURL( - browser(), http_url, content::PAGE_TRANSITION_TYPED); + browser(), http_url, ui::PAGE_TRANSITION_TYPED); ASSERT_EQ(2, browser()->tab_strip_model()->count()); ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(), browser()->host_desktop_type())); @@ -1293,7 +1293,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TabClosingWhenRemovingExtension) { extensions::TabHelper::FromWebContents(app_contents); extensions_tab_helper->SetExtensionApp(extension_app); - model->AddWebContents(app_contents, 0, content::PageTransitionFromInt(0), + model->AddWebContents(app_contents, 0, ui::PageTransitionFromInt(0), TabStripModel::ADD_NONE); model->SetTabPinned(0, true); ui_test_utils::NavigateToURL(browser(), url); @@ -1416,7 +1416,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) { // Open a new tab with a page in English. AddTabAtIndex(0, GURL(test_server()->GetURL("files/english_page.html")), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); WebContents* current_web_contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -1477,7 +1477,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { extensions::TabHelper* extensions_tab_helper = extensions::TabHelper::FromWebContents(app_contents); extensions_tab_helper->SetExtensionApp(extension_app); - model->AddWebContents(app_contents, 0, content::PageTransitionFromInt(0), + model->AddWebContents(app_contents, 0, ui::PageTransitionFromInt(0), TabStripModel::ADD_NONE); model->SetTabPinned(0, true); ui_test_utils::NavigateToURL(browser(), url); @@ -2084,7 +2084,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { EXPECT_EQ(1, popup_browser->tab_strip_model()->count()); // Now try opening another tab in the popup browser. - AddTabWithURLParams params1(url, content::PAGE_TRANSITION_TYPED); + AddTabWithURLParams params1(url, ui::PAGE_TRANSITION_TYPED); popup_browser->AddTabWithURL(¶ms1); EXPECT_EQ(popup_browser, params1.target); @@ -2102,7 +2102,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { // Now try opening another tab in the app browser. AddTabWithURLParams params2(GURL(url::kAboutBlankURL), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); app_browser->AddTabWithURL(¶ms2); EXPECT_EQ(app_browser, params2.target); @@ -2120,7 +2120,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { // Now try opening another tab in the app popup browser. AddTabWithURLParams params3(GURL(url::kAboutBlankURL), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); app_popup_browser->AddTabWithURL(¶ms3); EXPECT_EQ(app_popup_browser, params3.target); diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc index 23fa01d..1ca7f1c 100644 --- a/chrome/browser/ui/browser_close_browsertest.cc +++ b/chrome/browser/ui/browser_close_browsertest.cc @@ -26,10 +26,10 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/download_item.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/download_test_observer.h" #include "content/test/net/url_request_slow_download_job.h" +#include "ui/base/page_transition_types.h" using content::BrowserContext; using content::BrowserThread; @@ -180,7 +180,7 @@ class BrowserCloseTest : public InProcessBrowserTest { new Browser(Browser::CreateParams(profile, host_desktop_type)); chrome::AddSelectedTabWithURL(new_browser, GURL(url::kAboutBlankURL), - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); content::WaitForLoadStop( new_browser->tab_strip_model()->GetActiveWebContents()); new_browser->window()->Show(); diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index 071991c..43dd39e 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -213,7 +213,7 @@ WebContents* GetTabAndRevertIfNecessary(Browser* browser, case NEW_BACKGROUND_TAB: { WebContents* new_tab = current_tab->Clone(); browser->tab_strip_model()->AddWebContents( - new_tab, -1, content::PAGE_TRANSITION_LINK, + new_tab, -1, ui::PAGE_TRANSITION_LINK, (disposition == NEW_FOREGROUND_TAB) ? TabStripModel::ADD_ACTIVE : TabStripModel::ADD_NONE); return new_tab; @@ -223,7 +223,7 @@ WebContents* GetTabAndRevertIfNecessary(Browser* browser, Browser* new_browser = new Browser(Browser::CreateParams( browser->profile(), browser->host_desktop_type())); new_browser->tab_strip_model()->AddWebContents( - new_tab, -1, content::PAGE_TRANSITION_LINK, + new_tab, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_ACTIVE); new_browser->window()->Show(); return new_tab; @@ -393,7 +393,7 @@ void OpenURLOffTheRecord(Profile* profile, ScopedTabbedBrowserDisplayer displayer(profile->GetOffTheRecordProfile(), desktop_type); AddSelectedTabWithURL(displayer.browser(), url, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); } bool CanGoBack(const Browser* browser) { @@ -489,9 +489,9 @@ void Home(Browser* browser, WindowOpenDisposition disposition) { OpenURLParams params( url, Referrer(), disposition, - content::PageTransitionFromInt( - content::PAGE_TRANSITION_AUTO_BOOKMARK | - content::PAGE_TRANSITION_HOME_PAGE), + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_AUTO_BOOKMARK | + ui::PAGE_TRANSITION_HOME_PAGE), false); params.extra_headers = extra_headers; browser->OpenURL(params); @@ -505,9 +505,9 @@ void OpenCurrentURL(Browser* browser) { GURL url(location_bar->GetDestinationURL()); - content::PageTransition page_transition = location_bar->GetPageTransition(); - content::PageTransition page_transition_without_qualifier( - PageTransitionStripQualifier(page_transition)); + ui::PageTransition page_transition = location_bar->GetPageTransition(); + ui::PageTransition page_transition_without_qualifier( + ui::PageTransitionStripQualifier(page_transition)); WindowOpenDisposition open_disposition = location_bar->GetWindowOpenDisposition(); // A PAGE_TRANSITION_TYPED means the user has typed a URL. We do not want to @@ -517,8 +517,8 @@ void OpenCurrentURL(Browser* browser) { // Instant should also not handle PAGE_TRANSITION_RELOAD because its knowledge // of the omnibox text may be stale if the user focuses in the omnibox and // presses enter without typing anything. - if (page_transition_without_qualifier != content::PAGE_TRANSITION_TYPED && - page_transition_without_qualifier != content::PAGE_TRANSITION_RELOAD && + if (page_transition_without_qualifier != ui::PAGE_TRANSITION_TYPED && + page_transition_without_qualifier != ui::PAGE_TRANSITION_RELOAD && browser->instant_controller() && browser->instant_controller()->OpenInstant(open_disposition, url)) return; @@ -709,7 +709,7 @@ WebContents* DuplicateTabAt(Browser* browser, int index) { // The page transition below is only for the purpose of inserting the tab. new_browser->tab_strip_model()->AddWebContents( contents_dupe, -1, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_ACTIVE); } @@ -1216,7 +1216,7 @@ void ViewSource(Browser* browser, // The page transition below is only for the purpose of inserting the tab. b->tab_strip_model()->AddWebContents(view_source_contents, -1, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_ACTIVE); } diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc index bf05822..1870fb1 100644 --- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc +++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc @@ -37,7 +37,7 @@ void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage( // blocking, so bounce to an explanatory page for now. chrome::AddSelectedTabWithURL(browser_, GURL(kInsecureScriptHelpUrl), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); return; case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS: chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage); @@ -54,5 +54,5 @@ void BrowserContentSettingBubbleModelDelegate::ShowLearnMorePage( return; chrome::AddSelectedTabWithURL(browser_, GURL(chrome::kBlockedPluginLearnMoreURL), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); } diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index 3c890f3..3b81b33 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -248,7 +248,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocus) { // Create several tabs. for (int i = 0; i < 4; ++i) { chrome::AddSelectedTabWithURL(browser(), url, - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); } // Alternate focus for the tab. @@ -321,7 +321,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) { chrome::FocusLocationBar(browser()); // Create a 2nd tab. - chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, ui::PAGE_TRANSITION_TYPED); // Focus should be on the recently opened tab page. ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); @@ -525,7 +525,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabInitialFocus) { // Open about:blank, focus should be on the location bar. chrome::AddSelectedTabWithURL( - browser(), GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_LINK); + browser(), GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_LINK); ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop( browser()->tab_strip_model()->GetActiveWebContents())); EXPECT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); @@ -626,7 +626,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, NavigateFromOmniboxIntoNewTab) { GURL url2("http://maps.google.com/"); // Navigate to url. - chrome::NavigateParams p(browser(), url, content::PAGE_TRANSITION_LINK); + chrome::NavigateParams p(browser(), url, ui::PAGE_TRANSITION_LINK); p.window_action = chrome::NavigateParams::SHOW_WINDOW; p.disposition = CURRENT_TAB; chrome::Navigate(&p); @@ -639,7 +639,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, NavigateFromOmniboxIntoNewTab) { // Simulate an alt-enter. controller->OnAutocompleteAccept(url2, NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); // Make sure the second tab is selected. EXPECT_EQ(1, browser()->tab_strip_model()->active_index()); diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index 6b7c43a..fe927a6 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -398,7 +398,7 @@ namespace chrome { NavigateParams::NavigateParams(Browser* a_browser, const GURL& a_url, - content::PageTransition a_transition) + ui::PageTransition a_transition) : url(a_url), frame_tree_node_id(-1), uses_post(false), @@ -429,7 +429,7 @@ NavigateParams::NavigateParams(Browser* a_browser, source_contents(NULL), disposition(CURRENT_TAB), trusted_source(false), - transition(content::PAGE_TRANSITION_LINK), + transition(ui::PAGE_TRANSITION_LINK), is_renderer_initiated(false), tabstrip_index(-1), tabstrip_add_types(TabStripModel::ADD_ACTIVE), @@ -446,7 +446,7 @@ NavigateParams::NavigateParams(Browser* a_browser, NavigateParams::NavigateParams(Profile* a_profile, const GURL& a_url, - content::PageTransition a_transition) + ui::PageTransition a_transition) : url(a_url), frame_tree_node_id(-1), uses_post(false), @@ -577,16 +577,16 @@ void Navigate(NavigateParams* params) { // Determine if the navigation was user initiated. If it was, we need to // inform the target WebContents, and we may need to update the UI. - content::PageTransition base_transition = - content::PageTransitionStripQualifier(params->transition); + ui::PageTransition base_transition = + ui::PageTransitionStripQualifier(params->transition); bool user_initiated = - params->transition & content::PAGE_TRANSITION_FROM_ADDRESS_BAR || - base_transition == content::PAGE_TRANSITION_TYPED || - base_transition == content::PAGE_TRANSITION_AUTO_BOOKMARK || - base_transition == content::PAGE_TRANSITION_GENERATED || - base_transition == content::PAGE_TRANSITION_AUTO_TOPLEVEL || - base_transition == content::PAGE_TRANSITION_RELOAD || - base_transition == content::PAGE_TRANSITION_KEYWORD; + params->transition & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR || + base_transition == ui::PAGE_TRANSITION_TYPED || + base_transition == ui::PAGE_TRANSITION_AUTO_BOOKMARK || + base_transition == ui::PAGE_TRANSITION_GENERATED || + base_transition == ui::PAGE_TRANSITION_AUTO_TOPLEVEL || + base_transition == ui::PAGE_TRANSITION_RELOAD || + base_transition == ui::PAGE_TRANSITION_KEYWORD; // Check if this is a singleton tab that already exists int singleton_index = chrome::GetIndexOfSingletonTab(params); diff --git a/chrome/browser/ui/browser_navigator.h b/chrome/browser/ui/browser_navigator.h index 5cb200f..4209927 100644 --- a/chrome/browser/ui/browser_navigator.h +++ b/chrome/browser/ui/browser_navigator.h @@ -13,8 +13,8 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/global_request_id.h" #include "content/public/browser/page_navigator.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" +#include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/rect.h" #include "url/gurl.h" @@ -34,12 +34,12 @@ namespace chrome { // // Simple Navigate to URL in current tab: // chrome::NavigateParams params(browser, GURL("http://www.google.com/"), -// content::PAGE_TRANSITION_LINK); +// ui::PAGE_TRANSITION_LINK); // chrome::Navigate(¶ms); // // Open bookmark in new background tab: // chrome::NavigateParams params(browser, url, -// content::PAGE_TRANSITION_AUTO_BOOKMARK); +// ui::PAGE_TRANSITION_AUTO_BOOKMARK); // params.disposition = NEW_BACKGROUND_TAB; // chrome::Navigate(¶ms); // @@ -53,12 +53,12 @@ namespace chrome { struct NavigateParams { NavigateParams(Browser* browser, const GURL& a_url, - content::PageTransition a_transition); + ui::PageTransition a_transition); NavigateParams(Browser* browser, content::WebContents* a_target_contents); NavigateParams(Profile* profile, const GURL& a_url, - content::PageTransition a_transition); + ui::PageTransition a_transition); ~NavigateParams(); // The URL/referrer to be loaded. Ignored if |target_contents| is non-NULL. @@ -129,9 +129,9 @@ struct NavigateParams { bool trusted_source; // The transition type of the navigation. Default is - // content::PAGE_TRANSITION_LINK when target_contents is specified in the + // ui::PAGE_TRANSITION_LINK when target_contents is specified in the // constructor. - content::PageTransition transition; + ui::PageTransition transition; // Whether this navigation was initiated by the renderer process. Default is // false. diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index 037bf35..ac37ac9 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -74,7 +74,7 @@ chrome::NavigateParams BrowserNavigatorTest::MakeNavigateParams() const { chrome::NavigateParams BrowserNavigatorTest::MakeNavigateParams( Browser* browser) const { chrome::NavigateParams params(browser, GetGoogleURL(), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); params.window_action = chrome::NavigateParams::SHOW_WINDOW; return params; } @@ -248,9 +248,9 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExisting) { content::NotificationService::AllSources()); chrome::AddSelectedTabWithURL(browser(), singleton_url1, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); // We should have one browser with 3 tabs, the 3rd selected. EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); @@ -281,7 +281,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, GURL singleton_ref_url3("http://maps.google.com/"); chrome::AddSelectedTabWithURL(browser(), singleton_ref_url1, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); // We should have one browser with 2 tabs, 2nd selected. EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); @@ -779,7 +779,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Tabstrip_InsertAtIndex) { IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabNew_IgnorePath) { chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); // We should have one browser with 2 tabs, the 2nd selected. EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); @@ -811,9 +811,9 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExisting_IgnorePath) { GURL singleton_url1(GetSettingsURL()); chrome::AddSelectedTabWithURL(browser(), singleton_url1, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); // We should have one browser with 3 tabs, the 3rd selected. EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); @@ -845,9 +845,9 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExistingSubPath_IgnorePath) { GURL singleton_url1(GetContentSettingsURL()); chrome::AddSelectedTabWithURL(browser(), singleton_url1, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); // We should have one browser with 3 tabs, the 3rd selected. EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); @@ -879,9 +879,9 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExistingSubPath_IgnorePath2) { GURL singleton_url1(GetContentSettingsURL()); chrome::AddSelectedTabWithURL(browser(), singleton_url1, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); // We should have one browser with 3 tabs, the 3rd selected. EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); @@ -912,7 +912,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabFocused_IgnorePath) { GURL singleton_url_current(GetContentSettingsURL()); chrome::AddSelectedTabWithURL(browser(), singleton_url_current, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); // We should have one browser with 2 tabs, the 2nd selected. EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); @@ -945,7 +945,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, int initial_tab_count = browser()->tab_strip_model()->count(); GURL singleton_url_current("chrome://settings/internet"); chrome::AddSelectedTabWithURL(browser(), singleton_url_current, - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); EXPECT_EQ(initial_tab_count + 1, browser()->tab_strip_model()->count()); EXPECT_EQ(initial_tab_count, browser()->tab_strip_model()->active_index()); @@ -1003,7 +1003,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, DISABLED_Disposition_Settings_UseNonIncognitoWindowForBookmark) { chrome::NavigateParams params(browser(), GetSettingsURL(), - content::PAGE_TRANSITION_AUTO_BOOKMARK); + ui::PAGE_TRANSITION_AUTO_BOOKMARK); params.disposition = OFF_THE_RECORD; { content::WindowedNotificationObserver observer( @@ -1051,7 +1051,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, DISABLED_NavigateToCrashedSingletonTab) { GURL singleton_url(GetContentSettingsURL()); WebContents* web_contents = chrome::AddSelectedTabWithURL( - browser(), singleton_url, content::PAGE_TRANSITION_LINK); + browser(), singleton_url, ui::PAGE_TRANSITION_LINK); // We should have one browser with 2 tabs, the 2nd selected. EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); @@ -1220,7 +1220,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); observer.Wait(); } @@ -1239,7 +1239,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, CloseSingletonTab) { content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); observer.Wait(); } @@ -1314,7 +1314,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, // First navigate using the profile of the existing browser window, and // check that the window is reused. chrome::NavigateParams params(browser()->profile(), GetGoogleURL(), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); ui_test_utils::NavigateToURL(¶ms); EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); @@ -1322,7 +1322,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, // is created. chrome::NavigateParams params_incognito( browser()->profile()->GetOffTheRecordProfile(), - GetGoogleURL(), content::PAGE_TRANSITION_LINK); + GetGoogleURL(), ui::PAGE_TRANSITION_LINK); ui_test_utils::NavigateToURL(¶ms_incognito); EXPECT_EQ(2u, chrome::GetTotalBrowserCount()); } @@ -1334,12 +1334,12 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ViewSourceIsntSingleton) { chrome::NavigateParams viewsource_params(browser(), GURL(viewsource_ntp_url), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); ui_test_utils::NavigateToURL(&viewsource_params); chrome::NavigateParams singleton_params(browser(), GURL(chrome::kChromeUIVersionURL), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); singleton_params.disposition = SINGLETON_TAB; EXPECT_EQ(-1, chrome::GetIndexOfSingletonTab(&singleton_params)); } diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.cc b/chrome/browser/ui/browser_tab_strip_model_delegate.cc index ff7b0b7..58e5999 100644 --- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc +++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc @@ -23,7 +23,6 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" -#include "content/public/common/page_transition_types.h" #include "ipc/ipc_message.h" namespace chrome { diff --git a/chrome/browser/ui/browser_tabstrip.cc b/chrome/browser/ui/browser_tabstrip.cc index 1018bbd..b307c93 100644 --- a/chrome/browser/ui/browser_tabstrip.cc +++ b/chrome/browser/ui/browser_tabstrip.cc @@ -25,7 +25,7 @@ void AddTabAt(Browser* browser, const GURL& url, int idx, bool foreground) { base::TimeTicks new_tab_start_time = base::TimeTicks::Now(); chrome::NavigateParams params(browser, url.is_empty() ? GURL(chrome::kChromeUINewTabURL) : url, - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); params.disposition = foreground ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; params.tabstrip_index = idx; chrome::Navigate(¶ms); @@ -37,7 +37,7 @@ void AddTabAt(Browser* browser, const GURL& url, int idx, bool foreground) { content::WebContents* AddSelectedTabWithURL( Browser* browser, const GURL& url, - content::PageTransition transition) { + ui::PageTransition transition) { NavigateParams params(browser, url, transition); params.disposition = NEW_FOREGROUND_TAB; Navigate(¶ms); diff --git a/chrome/browser/ui/browser_tabstrip.h b/chrome/browser/ui/browser_tabstrip.h index 6d1055c..6a21c28 100644 --- a/chrome/browser/ui/browser_tabstrip.h +++ b/chrome/browser/ui/browser_tabstrip.h @@ -7,7 +7,7 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" class Browser; @@ -33,7 +33,7 @@ void AddTabAt(Browser* browser, const GURL& url, int index, bool foreground); // created WebContents. content::WebContents* AddSelectedTabWithURL(Browser* browser, const GURL& url, - content::PageTransition transition); + ui::PageTransition transition); // Creates a new tab with the already-created WebContents 'new_contents'. // The window for the added contents will be reparented correctly when this diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 3dec7e5..6f958194 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -147,7 +147,7 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id, url, content::Referrer(previousURL, blink::WebReferrerPolicyDefault), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); } @@ -267,7 +267,7 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id, entry->GetURL().spec()), Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); } } diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript.mm b/chrome/browser/ui/cocoa/applescript/window_applescript.mm index ba9325207..e86db50 100644 --- a/chrome/browser/ui/cocoa/applescript/window_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/window_applescript.mm @@ -179,7 +179,7 @@ content::WebContents* contents = chrome::AddSelectedTabWithURL( browser_, GURL(chrome::kChromeUINewTabURL), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(contents); core_tab_helper->set_new_tab_start_time(newTabStartTime); [aTab setWebContents:contents]; @@ -194,7 +194,7 @@ // Set how long it takes a tab to be created. base::TimeTicks newTabStartTime = base::TimeTicks::Now(); chrome::NavigateParams params(browser_, GURL(chrome::kChromeUINewTabURL), - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); params.disposition = NEW_FOREGROUND_TAB; params.tabstrip_index = index; chrome::Navigate(¶ms); diff --git a/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm index 7293c4b..c06182c 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm @@ -101,7 +101,7 @@ void CocoaSignInDelegate::HandleKeyboardEvent( webContents_->GetController().LoadURL( dialog_->delegate()->SignInUrl(), content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 685c00b..a9120c6 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -949,7 +949,7 @@ void RecordAppLaunch(Profile* profile, GURL url) { // override. - (void)openURL:(GURL)url disposition:(WindowOpenDisposition)disposition { OpenURLParams params( - url, Referrer(), disposition, content::PAGE_TRANSITION_AUTO_BOOKMARK, + url, Referrer(), disposition, ui::PAGE_TRANSITION_AUTO_BOOKMARK, false); browser_->OpenURL(params); } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm index 7683d71..00f6447 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm @@ -98,7 +98,7 @@ const NSUInteger kMaximumMenuPixelsWide = 300; ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); OpenURLParams params( node->url(), Referrer(), disposition, - content::PAGE_TRANSITION_AUTO_BOOKMARK, false); + ui::PAGE_TRANSITION_AUTO_BOOKMARK, false); browser->OpenURL(params); } diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index 0c6387d..2230fc6 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -1916,7 +1916,7 @@ using content::WebContents; if (webContents) { OpenURLParams params( GURL(chrome::kCrashReasonURL), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); webContents->OpenURL(params); } } diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm index 021c33e..9628ced 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm @@ -48,7 +48,7 @@ class ConstrainedWindowMacTest : public InProcessBrowserTest { } virtual void SetUpOnMainThread() OVERRIDE { - AddTabAtIndex(1, GURL("about:blank"), content::PAGE_TRANSITION_LINK); + AddTabAtIndex(1, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); tab0_ = browser()->tab_strip_model()->GetWebContentsAt(0); tab1_ = browser()->tab_strip_model()->GetWebContentsAt(1); EXPECT_EQ(tab1_, browser()->tab_strip_model()->GetActiveWebContents()); diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm index f6b70b3..f540d86 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm @@ -184,7 +184,7 @@ class AsyncUninstaller : public extensions::ExtensionUninstallDialog::Delegate { OpenURLParams params(url, Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); browser_->OpenURL(params); } diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm index d8ef9aa..90cac17 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm @@ -211,7 +211,7 @@ bool HasAttribute(id item, CellAttributesMask attributeMask) { GURL store_url(extension_urls::GetWebstoreItemDetailURLPrefix() + prompt_->extension()->id()); navigator_->OpenURL(OpenURLParams( - store_url, Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, + store_url, Referrer(), NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false)); delegate_->InstallUIAbort(/*user_initiated=*/true); diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_browsertest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_browsertest.mm index 9ea5b0e..4a6042f 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_browsertest.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_browsertest.mm @@ -25,7 +25,7 @@ bool FindBarHasFocus(Browser* browser) { typedef InProcessBrowserTest FindBarBrowserTest; IN_PROC_BROWSER_TEST_F(FindBarBrowserTest, FocusOnTabSwitch) { - AddTabAtIndex(1, GURL("about:blank"), content::PAGE_TRANSITION_LINK); + AddTabAtIndex(1, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); browser()->GetFindBarController()->Show(); // Verify that if the find bar has focus then switching tabs and changing diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm index 33e8e1d..e2adc9a 100644 --- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm @@ -56,7 +56,7 @@ using content::Referrer; WindowOpenDisposition disposition = ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); chrome::NavigateParams params(bridge_->profile(), node->url, - content::PAGE_TRANSITION_AUTO_BOOKMARK); + ui::PAGE_TRANSITION_AUTO_BOOKMARK); params.disposition = disposition; chrome::Navigate(¶ms); } diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 6948bd6..87a7347 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h @@ -59,7 +59,7 @@ class LocationBarViewMac : public LocationBar, virtual void ShowFirstRunBubble() OVERRIDE; virtual GURL GetDestinationURL() const OVERRIDE; virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; - virtual content::PageTransition GetPageTransition() const OVERRIDE; + virtual ui::PageTransition GetPageTransition() const OVERRIDE; virtual void AcceptInput() OVERRIDE; virtual void FocusLocation(bool select_all) OVERRIDE; virtual void FocusSearch() OVERRIDE; diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 2ced6d7..ce60ce6 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -183,7 +183,7 @@ WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const { return disposition(); } -content::PageTransition LocationBarViewMac::GetPageTransition() const { +ui::PageTransition LocationBarViewMac::GetPageTransition() const { return transition(); } diff --git a/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm b/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm index e6490ac..cfc85e1 100644 --- a/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm +++ b/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm @@ -115,7 +115,7 @@ void ShiftOriginY(NSView* view, CGFloat amount) { else { content::OpenURLParams params(GURL(chrome::kChromeUISettingsURL), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); webContents_->OpenURL(params); } [self close]; @@ -292,7 +292,7 @@ void ShiftOriginY(NSView* view, CGFloat amount) { NEW_WINDOW : NEW_FOREGROUND_TAB; content::OpenURLParams params(GURL(chrome::kChromeSyncLearnMoreURL), content::Referrer(), location, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); webContents_->OpenURL(params); return YES; } diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_browsertest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_browsertest.mm index 957afab..b01298e 100644 --- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_browsertest.mm +++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_browsertest.mm @@ -107,7 +107,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleTest, TabChangeTogglesIcon) { // Open a new tab. int firstTab = browser()->tab_strip_model()->active_index(); AddTabAtIndex( - firstTab + 1, GURL("http://foo.bar/"), content::PAGE_TRANSITION_TYPED); + firstTab + 1, GURL("http://foo.bar/"), ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(decoration()->IsVisible()); // Switch back to the previous tab. diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm index b90c224..9771594 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm @@ -1883,7 +1883,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver, content::WebContents::CreateParams(browser_->profile()))); webContents_->GetController().LoadURL(url, content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); NSView* webview = webContents_->GetNativeView(); [webview setFrameSize:NSMakeSize(kFixedGaiaViewWidth, kFixedGaiaViewHeight)]; diff --git a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm index 4b550c6..7413fec 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm @@ -396,7 +396,7 @@ NSTextField* AddTextField( - (void)learnMore { chrome::NavigateParams params( browser_, GURL(chrome::kChromeEnterpriseSignInLearnMoreURL), - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); params.disposition = NEW_POPUP; params.window_action = chrome::NavigateParams::SHOW_WINDOW; chrome::Navigate(¶ms); diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm index 6762cd4..678881e 100644 --- a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm +++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm @@ -140,7 +140,7 @@ class UserManagerWebContentsDelegate : public content::WebContentsDelegate { - (void)showURL:(const GURL&)url { webContents_->GetController().LoadURL(url, content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); [self show]; } diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 20e3aca..2cf76db 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -2064,7 +2064,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) { case NEW_FOREGROUND_TAB: { content::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs")); chrome::NavigateParams params(browser_, *url, - content::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_TYPED); params.disposition = disposition; params.tabstrip_index = index; params.tabstrip_add_types = @@ -2075,7 +2075,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) { case CURRENT_TAB: { content::RecordAction(UserMetricsAction("Tab_DropURLOnTab")); OpenURLParams params( - *url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false); + *url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false); tabStripModel_->GetWebContentsAt(index)->OpenURL(params); tabStripModel_->ActivateTabAt(index, true); break; diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index d9252ac..a7de9f2 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -795,7 +795,7 @@ class NotificationBridge : public WrenchMenuBadgeController::Delegate { OmniboxView::StripJavascriptSchemas(base::UTF8ToUTF16(url.spec()))); } OpenURLParams params( - url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false); + url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false); browser_->tab_strip_model()->GetActiveWebContents()->OpenURL(params); } @@ -813,7 +813,7 @@ class NotificationBridge : public WrenchMenuBadgeController::Delegate { GURL url(match.destination_url); OpenURLParams params( - url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false); + url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false); browser_->tab_strip_model()->GetActiveWebContents()->OpenURL(params); } diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm index 97bfe10..083b23d 100644 --- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm @@ -112,7 +112,7 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); // VIEW_ID_TAB_LAST should always be available. @@ -123,7 +123,7 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); CheckViewID(VIEW_ID_TAB_LAST, true); } diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm index 8c31923..fd83849 100644 --- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm @@ -353,7 +353,7 @@ void WebDialogWindowDelegateBridge::HandleKeyboardEvent( webContents_->GetController().LoadURL( delegate_->GetDialogContentURL(), content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); // TODO(akalin): add accelerator for ESC to close the dialog box. diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm index aaa48a5..7bf04ca 100644 --- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm @@ -526,7 +526,7 @@ NSColor* IdentityVerifiedTextColor() { - (void)showHelpPage:(id)sender { webContents_->OpenURL(content::OpenURLParams( GURL(chrome::kPageInfoHelpCenterURL), content::Referrer(), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false)); + NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false)); } // Create the contents of the Connection tab and add it to the given tab view. diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc index 34725c3..140751f 100644 --- a/chrome/browser/ui/extensions/application_launch.cc +++ b/chrome/browser/ui/extensions/application_launch.cc @@ -182,7 +182,7 @@ WebContents* OpenApplicationWindow(const AppLaunchParams& params) { Browser* browser = new Browser(browser_params); WebContents* web_contents = chrome::AddSelectedTabWithURL( - browser, url, content::PAGE_TRANSITION_AUTO_TOPLEVEL); + browser, url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); web_contents->GetMutableRendererPrefs()->can_accept_load_drops = false; web_contents->GetRenderViewHost()->SyncRendererPrefs(); @@ -228,7 +228,7 @@ WebContents* OpenApplicationTab(const AppLaunchParams& launch_params) { GURL extension_url = UrlForExtension(extension, launch_params.override_url); chrome::NavigateParams params(browser, extension_url, - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); params.tabstrip_add_types = add_type; params.disposition = disposition; @@ -242,7 +242,7 @@ WebContents* OpenApplicationTab(const AppLaunchParams& launch_params) { extension_url, content::Referrer(existing_tab->GetURL(), blink::WebReferrerPolicyDefault), - disposition, content::PAGE_TRANSITION_LINK, false)); + disposition, ui::PAGE_TRANSITION_LINK, false)); // Reset existing_tab as OpenURL() may have clobbered it. existing_tab = browser->tab_strip_model()->GetActiveWebContents(); if (params.tabstrip_add_types & TabStripModel::ADD_PINNED) { diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.cc b/chrome/browser/ui/extensions/extension_install_ui_default.cc index edc1fb1..d6cad97 100644 --- a/chrome/browser/ui/extensions/extension_install_ui_default.cc +++ b/chrome/browser/ui/extensions/extension_install_ui_default.cc @@ -133,7 +133,7 @@ bool ErrorInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { GURL("http://support.google.com/chrome_webstore/?p=crx_warning"), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } diff --git a/chrome/browser/ui/find_bar/find_bar_controller.cc b/chrome/browser/ui/find_bar/find_bar_controller.cc index 5241fa4..b0bdf9b 100644 --- a/chrome/browser/ui/find_bar/find_bar_controller.cc +++ b/chrome/browser/ui/find_bar/find_bar_controller.cc @@ -153,12 +153,12 @@ void FindBarController::Observe(int type, if (source_controller == &web_contents_->GetController()) { content::LoadCommittedDetails* commit_details = content::Details<content::LoadCommittedDetails>(details).ptr(); - content::PageTransition transition_type = + ui::PageTransition transition_type = commit_details->entry->GetTransitionType(); // Hide the find bar on reload or navigation. if (find_bar_->IsFindBarVisible() && - (content::PageTransitionStripQualifier(transition_type) == - content::PAGE_TRANSITION_RELOAD || + (ui::PageTransitionStripQualifier(transition_type) == + ui::PAGE_TRANSITION_RELOAD || commit_details->is_navigation_to_different_page())) EndFindSession(kKeepSelectionOnPage, kClearResultsInFindBox); } diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 13fc6e0..83e24e8 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -1203,7 +1203,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulateInNewTab) { EXPECT_EQ(ASCIIToUTF16("1 of 1"), GetMatchCountText()); // Now create a second tab and load the same page. - chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, ui::PAGE_TRANSITION_TYPED); WebContents* web_contents_2 = browser()->tab_strip_model()->GetActiveWebContents(); EXPECT_NE(web_contents_1, web_contents_2); @@ -1328,7 +1328,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_NoIncognitoPrepopulate) { content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); chrome::AddSelectedTabWithURL(incognito_browser, url, - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); observer.Wait(); incognito_browser->window()->Show(); @@ -1349,7 +1349,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_NoIncognitoPrepopulate) { FindBarController::kKeepResultsInFindBox); // Now open a new tab in the original (non-incognito) browser. - chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, ui::PAGE_TRANSITION_TYPED); WebContents* web_contents_2 = browser()->tab_strip_model()->GetActiveWebContents(); EXPECT_NE(web_contents_1, web_contents_2); @@ -1392,7 +1392,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FitWindow) { content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); chrome::AddSelectedTabWithURL( - popup, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_LINK); + popup, GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_LINK); // Wait for the page to finish loading. observer.Wait(); popup->window()->Show(); diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc index 210ca2f..6a751e6 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc @@ -22,7 +22,7 @@ using url::kAboutBlankURL; using content::WebContents; -using content::PAGE_TRANSITION_TYPED; +using ui::PAGE_TRANSITION_TYPED; class FullscreenControllerBrowserTest: public FullscreenControllerTest { }; diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc index 9a51374..4fa9851 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc @@ -24,7 +24,7 @@ using url::kAboutBlankURL; using content::WebContents; -using content::PAGE_TRANSITION_TYPED; +using ui::PAGE_TRANSITION_TYPED; namespace { diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc index 01c7ac3..e828c8a 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc @@ -54,7 +54,7 @@ Browser* FullscreenControllerStateInteractiveTest::GetBrowser() { IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, DISABLED_TransitionsForEachState) { // A tab is needed for tab fullscreen. - AddTabAtIndex(0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_TYPED); TestTransitionsForEachState(); // Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog(); } @@ -65,15 +65,15 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, // An "empty" test is included as part of each "TEST_EVENT" because it makes // running the entire test suite less flaky on MacOS. All of the tests pass // when run individually. -#define TEST_EVENT(state, event) \ - IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \ - DISABLED_##state##__##event##__Empty) {} \ - IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \ - DISABLED_##state##__##event) { \ - AddTabAtIndex( \ - 0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); \ - ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event)) \ - << GetAndClearDebugLog(); \ +#define TEST_EVENT(state, event) \ + IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \ + DISABLED_##state##__##event##__Empty) {} \ + IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \ + DISABLED_##state##__##event) { \ + AddTabAtIndex( \ + 0, GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_TYPED); \ + ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event)) \ + << GetAndClearDebugLog(); \ } // Progress of tests can be examined by inserting the following line: // LOG(INFO) << GetAndClearDebugLog(); } @@ -87,7 +87,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, DISABLED_ManualTest) { // A tab is needed for tab fullscreen. - AddTabAtIndex(0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_TYPED); ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN)) << GetAndClearDebugLog(); ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)) << GetAndClearDebugLog(); ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE)) << GetAndClearDebugLog(); diff --git a/chrome/browser/ui/location_bar/location_bar.h b/chrome/browser/ui/location_bar/location_bar.h index 53a2c9f..2a05187 100644 --- a/chrome/browser/ui/location_bar/location_bar.h +++ b/chrome/browser/ui/location_bar/location_bar.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_LOCATION_BAR_LOCATION_BAR_H_ #define CHROME_BROWSER_UI_LOCATION_BAR_LOCATION_BAR_H_ -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" #include "url/gurl.h" @@ -37,7 +37,7 @@ class LocationBar { // The details necessary to open the user's desired omnibox match. virtual GURL GetDestinationURL() const = 0; virtual WindowOpenDisposition GetWindowOpenDisposition() const = 0; - virtual content::PageTransition GetPageTransition() const = 0; + virtual ui::PageTransition GetPageTransition() const = 0; // Accepts the current string of text entered in the location bar. virtual void AcceptInput() = 0; diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc index 004f68d..2d0a2a8 100644 --- a/chrome/browser/ui/login/login_prompt_browsertest.cc +++ b/chrome/browser/ui/login/login_prompt_browsertest.cc @@ -179,7 +179,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, PrefetchAuthCancels) { WindowedLoadStopObserver load_stop_waiter(controller, 1); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); load_stop_waiter.Wait(); @@ -202,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestBasicAuth) { { WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); } @@ -252,7 +252,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestDigestAuth) { { WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); } @@ -315,7 +315,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestTwoAuths) { WindowedAuthNeededObserver auth_needed_waiter(controller1); contents1->OpenURL(OpenURLParams( test_server()->GetURL(kAuthBasicPage), Referrer(), - CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); + CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); } @@ -323,7 +323,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestTwoAuths) { WindowedAuthNeededObserver auth_needed_waiter(controller2); contents2->OpenURL(OpenURLParams( test_server()->GetURL(kAuthDigestPage), Referrer(), - CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); + CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); } @@ -374,12 +374,12 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth) { WindowedLoadStopObserver load_stop_waiter(controller, 2); WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - auth_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + auth_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); WindowedAuthCancelledObserver auth_cancelled_waiter(controller); browser()->OpenURL(OpenURLParams( - no_auth_page_2, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + no_auth_page_2, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_cancelled_waiter.Wait(); load_stop_waiter.Wait(); @@ -392,7 +392,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth) { WindowedLoadStopObserver load_stop_waiter(controller, 2); WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - auth_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + auth_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); WindowedAuthCancelledObserver auth_cancelled_waiter(controller); @@ -416,7 +416,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth) { WindowedLoadStopObserver load_stop_waiter(controller, 2); WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - auth_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + auth_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); WindowedAuthCancelledObserver auth_cancelled_waiter(controller); @@ -432,7 +432,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth) { WindowedLoadStopObserver load_stop_waiter(controller, 1); WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - auth_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + auth_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); WindowedAuthCancelledObserver auth_cancelled_waiter(controller); @@ -466,7 +466,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmCancellation) { { WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); } @@ -519,7 +519,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmConfirmation) { WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); } @@ -566,7 +566,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, IncorrectConfirmation) { { WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); } @@ -639,7 +639,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, NoLoginPromptForFavicon) { GURL test_page = test_server()->GetURL(kFaviconTestPage); WindowedLoadStopObserver load_stop_waiter(controller, 1); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); load_stop_waiter.Wait(); } @@ -651,7 +651,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, NoLoginPromptForFavicon) { WindowedLoadStopObserver load_stop_waiter(controller, 1); WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); ASSERT_EQ(1u, observer.handlers().size()); @@ -704,7 +704,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, WindowedLoadStopObserver load_stop_waiter(controller, 1); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); load_stop_waiter.Wait(); } @@ -726,7 +726,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); ASSERT_EQ(1u, observer.handlers().size()); @@ -774,7 +774,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); ASSERT_EQ(1u, observer.handlers().size()); @@ -834,13 +834,13 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) { test_server()->GetURL("auth-basic/1"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); contents_2->OpenURL(OpenURLParams( test_server()->GetURL("auth-basic/2"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter_1.Wait(); auth_needed_waiter_2.Wait(); @@ -898,13 +898,13 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) { test_server()->GetURL("auth-basic/1"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); contents_2->OpenURL(OpenURLParams( test_server()->GetURL("auth-basic/2"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter_1.Wait(); auth_needed_waiter_2.Wait(); @@ -963,13 +963,13 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, test_server()->GetURL("auth-basic/1"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); contents_incognito->OpenURL(OpenURLParams( test_server()->GetURL("auth-basic/2"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); auth_needed_waiter_incognito.Wait(); @@ -1023,7 +1023,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, GURL test_page = test_server()->GetURL(kXHRTestPage); WindowedLoadStopObserver load_stop_waiter(controller, 1); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); load_stop_waiter.Wait(); } @@ -1058,7 +1058,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, GURL test_page = test_server()->GetURL(kXHRTestPage); WindowedLoadStopObserver load_stop_waiter(controller, 1); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); load_stop_waiter.Wait(); } @@ -1093,7 +1093,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, GURL test_page = test_server()->GetURL(kXHRTestPage); WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); } @@ -1157,7 +1157,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, GURL test_page = test_server()->GetURL(kXHRTestPage); WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); auth_needed_waiter.Wait(); } @@ -1197,7 +1197,7 @@ void LoginPromptBrowserTest::TestCrossOriginPrompt( { WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - visit_url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + visit_url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); ASSERT_EQ(visit_url.host(), contents->GetVisibleURL().host()); auth_needed_waiter.Wait(); @@ -1274,7 +1274,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, WindowedAuthNeededObserver auth_needed_waiter(controller); browser()->OpenURL(OpenURLParams( - test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, + test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); ASSERT_EQ("127.0.0.1", contents->GetURL().host()); WaitForInterstitialAttach(contents); diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc index 0b124bb..5d237ee 100644 --- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc +++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc @@ -84,7 +84,7 @@ bool AlternateNavInfoBarDelegate::LinkClicked( // default action when it's typed again in the future. InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL( content::OpenURLParams(match_.destination_url, content::Referrer(), - disposition, content::PAGE_TRANSITION_TYPED, + disposition, ui::PAGE_TRANSITION_TYPED, false)); // We should always close, even if the navigation did not occur within this diff --git a/chrome/browser/ui/omnibox/omnibox_edit_controller.cc b/chrome/browser/ui/omnibox/omnibox_edit_controller.cc index 05d01bb..480d8dd 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_controller.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_controller.cc @@ -11,7 +11,7 @@ void OmniboxEditController::OnAutocompleteAccept( const GURL& destination_url, WindowOpenDisposition disposition, - content::PageTransition transition) { + ui::PageTransition transition) { destination_url_ = destination_url; disposition_ = disposition; transition_ = transition; @@ -22,9 +22,9 @@ void OmniboxEditController::OnAutocompleteAccept( OmniboxEditController::OmniboxEditController(CommandUpdater* command_updater) : command_updater_(command_updater), disposition_(CURRENT_TAB), - transition_(content::PageTransitionFromInt( - content::PAGE_TRANSITION_TYPED | - content::PAGE_TRANSITION_FROM_ADDRESS_BAR)) { + transition_(ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_TYPED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)) { } void OmniboxEditController::HideOriginChip() { diff --git a/chrome/browser/ui/omnibox/omnibox_edit_controller.h b/chrome/browser/ui/omnibox/omnibox_edit_controller.h index 5ec29f4..f1e849f 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_controller.h +++ b/chrome/browser/ui/omnibox/omnibox_edit_controller.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_CONTROLLER_H_ #include "base/strings/string16.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" #include "url/gurl.h" @@ -30,7 +30,7 @@ class OmniboxEditController { public: void OnAutocompleteAccept(const GURL& destination_url, WindowOpenDisposition disposition, - content::PageTransition transition); + ui::PageTransition transition); // Updates the controller, and, if |contents| is non-NULL, restores saved // state that the tab holds. @@ -78,7 +78,7 @@ class OmniboxEditController { CommandUpdater* command_updater() { return command_updater_; } GURL destination_url() const { return destination_url_; } WindowOpenDisposition disposition() const { return disposition_; } - content::PageTransition transition() const { return transition_; } + ui::PageTransition transition() const { return transition_; } private: CommandUpdater* command_updater_; @@ -86,7 +86,7 @@ class OmniboxEditController { // The details necessary to open the user's desired omnibox match. GURL destination_url_; WindowOpenDisposition disposition_; - content::PageTransition transition_; + ui::PageTransition transition_; DISALLOW_COPY_AND_ASSIGN(OmniboxEditController); }; diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index d0c976d..3550347 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -119,7 +119,7 @@ const int kPercentageMatchHistogramWidthBuckets[] = { 400, 700, 1200 }; void RecordPercentageMatchHistogram(const base::string16& old_text, const base::string16& new_text, bool url_replacement_active, - content::PageTransition transition, + ui::PageTransition transition, int omnibox_width) { size_t avg_length = (old_text.length() + new_text.length()) / 2; @@ -135,7 +135,7 @@ void RecordPercentageMatchHistogram(const base::string16& old_text, std::string histogram_name; if (url_replacement_active) { - if (transition == content::PAGE_TRANSITION_TYPED) { + if (transition == ui::PAGE_TRANSITION_TYPED) { histogram_name = "InstantExtended.PercentageMatchV2_QuerytoURL"; UMA_HISTOGRAM_PERCENTAGE(histogram_name, percent); } else { @@ -143,7 +143,7 @@ void RecordPercentageMatchHistogram(const base::string16& old_text, UMA_HISTOGRAM_PERCENTAGE(histogram_name, percent); } } else { - if (transition == content::PAGE_TRANSITION_TYPED) { + if (transition == ui::PAGE_TRANSITION_TYPED) { histogram_name = "InstantExtended.PercentageMatchV2_URLtoURL"; UMA_HISTOGRAM_PERCENTAGE(histogram_name, percent); } else { @@ -669,7 +669,7 @@ void OmniboxEditModel::AcceptInput(WindowOpenDisposition disposition, if (!match.destination_url.is_valid()) return; - if ((match.transition == content::PAGE_TRANSITION_TYPED) && + if ((match.transition == ui::PAGE_TRANSITION_TYPED) && (match.destination_url == PermanentURL())) { // When the user hit enter on the existing permanent URL, treat it like a // reload for scoring purposes. We could detect this by just checking @@ -680,13 +680,13 @@ void OmniboxEditModel::AcceptInput(WindowOpenDisposition disposition, // different from the current URL, even if it wound up at the same place // (e.g. manually retyping the same search query), and it seems wrong to // treat this as a reload. - match.transition = content::PAGE_TRANSITION_RELOAD; + match.transition = ui::PAGE_TRANSITION_RELOAD; } else if (for_drop || ((paste_state_ != NONE) && match.is_history_what_you_typed_match)) { // When the user pasted in a URL and hit enter, score it like a link click // rather than a normal typed URL, so it doesn't get inline autocompleted // as aggressively later. - match.transition = content::PAGE_TRANSITION_LINK; + match.transition = ui::PAGE_TRANSITION_LINK; } TemplateURLService* service = @@ -792,7 +792,7 @@ void OmniboxEditModel::OpenMatch(AutocompleteMatch match, TemplateURLServiceFactory::GetForProfile(profile_); TemplateURL* template_url = match.GetTemplateURL(service, false); if (template_url) { - if (match.transition == content::PAGE_TRANSITION_KEYWORD) { + if (match.transition == ui::PAGE_TRANSITION_KEYWORD) { // The user is using a non-substituting keyword or is explicitly in // keyword mode. @@ -809,7 +809,7 @@ void OmniboxEditModel::OpenMatch(AutocompleteMatch match, TemplateURLServiceFactory::GetForProfile(profile_)->IncrementUsageCount( template_url); } else { - DCHECK_EQ(content::PAGE_TRANSITION_GENERATED, match.transition); + DCHECK_EQ(ui::PAGE_TRANSITION_GENERATED, match.transition); // NOTE: We purposefully don't increment the usage count of the default // search engine here like we do for explicit keywords above; see comments // in template_url.h. @@ -848,8 +848,8 @@ void OmniboxEditModel::OpenMatch(AutocompleteMatch match, base::AutoReset<bool> tmp(&in_revert_, true); controller_->OnAutocompleteAccept( match.destination_url, disposition, - content::PageTransitionFromInt( - match.transition | content::PAGE_TRANSITION_FROM_ADDRESS_BAR)); + ui::PageTransitionFromInt( + match.transition | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)); if (observer->load_state() != OmniboxNavigationObserver::LOAD_NOT_SEEN) ignore_result(observer.release()); // The observer will delete itself. } @@ -1339,7 +1339,7 @@ void OmniboxEditModel::GetInfoForCurrentText(AutocompleteMatch* match, match->provider = autocomplete_controller()->search_provider(); match->destination_url = delegate_->GetNavigationController().GetVisibleEntry()->GetURL(); - match->transition = content::PAGE_TRANSITION_RELOAD; + match->transition = ui::PAGE_TRANSITION_RELOAD; } else if (query_in_progress() || (popup_model() && popup_model()->IsOpen())) { if (query_in_progress()) { diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h index 987b75b..5b05ee1 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.h +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h @@ -17,7 +17,6 @@ #include "components/metrics/proto/omnibox_event.pb.h" #include "components/omnibox/autocomplete_input.h" #include "components/omnibox/autocomplete_match.h" -#include "content/public/common/page_transition_types.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/native_widget_types.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/panels/panel_host.cc b/chrome/browser/ui/panels/panel_host.cc index ed6b629..28d5ae2 100644 --- a/chrome/browser/ui/panels/panel_host.cc +++ b/chrome/browser/ui/panels/panel_host.cc @@ -72,7 +72,7 @@ void PanelHost::Init(const GURL& url) { web_contents_.get()); web_contents_->GetController().LoadURL( - url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); + url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); } void PanelHost::DestroyWebContents() { @@ -104,7 +104,7 @@ content::WebContents* PanelHost::OpenURLFromTab( return NULL; // Only allow clicks on links. - if (params.transition != content::PAGE_TRANSITION_LINK) + if (params.transition != ui::PAGE_TRANSITION_LINK) return NULL; // Force all links to open in a new tab. @@ -142,7 +142,7 @@ void PanelHost::AddNewContents(content::WebContents* source, bool user_gesture, bool* was_blocked) { chrome::NavigateParams navigate_params(profile_, new_contents->GetURL(), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); navigate_params.target_contents = new_contents; // Force all links to open in a new tab, even if they were trying to open a diff --git a/chrome/browser/ui/passwords/manage_passwords_test.cc b/chrome/browser/ui/passwords/manage_passwords_test.cc index e3abdc6..8f0bf97 100644 --- a/chrome/browser/ui/passwords/manage_passwords_test.cc +++ b/chrome/browser/ui/passwords/manage_passwords_test.cc @@ -22,7 +22,7 @@ #include "testing/gtest/include/gtest/gtest.h" void ManagePasswordsTest::SetUpOnMainThread() { - AddTabAtIndex(0, GURL("http://example.com/"), content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL("http://example.com/"), ui::PAGE_TRANSITION_TYPED); // Create the test UIController here so that it's bound to the currently // active WebContents. new ManagePasswordsUIControllerMock( diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc index df2cc29..0dc9467 100644 --- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc +++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc @@ -174,7 +174,7 @@ void ManagePasswordsUIController::NavigateToAccountCentralManagementPage() { Browser* browser = chrome::FindBrowserWithWebContents(web_contents()); content::OpenURLParams params( GURL(chrome::kAutoPasswordGenerationLearnMoreURL), content::Referrer(), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false); + NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false); browser->OpenURL(params); #endif } diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc index d1a351d..5705cea 100644 --- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc +++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc @@ -87,11 +87,11 @@ PDFEnableAdobeReaderPromptClient::~PDFEnableAdobeReaderPromptClient() { bool PDFEnableAdobeReaderPromptClient::ShouldExpire( const content::LoadCommittedDetails& details) const { - content::PageTransition transition = - content::PageTransitionStripQualifier(details.entry->GetTransitionType()); + ui::PageTransition transition = + ui::PageTransitionStripQualifier(details.entry->GetTransitionType()); // We don't want to expire on a reload, because that is how we open the PDF in // Reader. - return !details.is_in_page && transition != content::PAGE_TRANSITION_RELOAD; + return !details.is_in_page && transition != ui::PAGE_TRANSITION_RELOAD; } void PDFEnableAdobeReaderPromptClient::Accept() { @@ -123,7 +123,7 @@ base::string16 PDFEnableAdobeReaderPromptClient::GetMessageText() const { void OpenReaderUpdateURL(WebContents* web_contents) { OpenURLParams params( GURL(kAdobeReaderUpdateUrl), Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); web_contents->OpenURL(params); } diff --git a/chrome/browser/ui/search/instant_page.cc b/chrome/browser/ui/search/instant_page.cc index 07d09a2..3b412ac 100644 --- a/chrome/browser/ui/search/instant_page.cc +++ b/chrome/browser/ui/search/instant_page.cc @@ -74,7 +74,7 @@ bool InstantPage::ShouldProcessAboutToNavigateMainFrame() { void InstantPage::DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition /* transition_type */) { + ui::PageTransition /* transition_type */) { if (!render_frame_host->GetParent() && ShouldProcessAboutToNavigateMainFrame()) delegate_->InstantPageAboutToNavigateMainFrame(web_contents(), url); diff --git a/chrome/browser/ui/search/instant_page.h b/chrome/browser/ui/search/instant_page.h index 9ce3168..1d6d069 100644 --- a/chrome/browser/ui/search/instant_page.h +++ b/chrome/browser/ui/search/instant_page.h @@ -13,7 +13,7 @@ #include "base/strings/string16.h" #include "chrome/browser/ui/search/search_model_observer.h" #include "content/public/browser/web_contents_observer.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" class GURL; class Profile; @@ -102,7 +102,7 @@ class InstantPage : public content::WebContentsObserver, virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; // Overridden from SearchModelObserver: virtual void ModelChanged(const SearchModel::State& old_state, diff --git a/chrome/browser/ui/search/instant_page_unittest.cc b/chrome/browser/ui/search/instant_page_unittest.cc index 1632bcc..ce137dc 100644 --- a/chrome/browser/ui/search/instant_page_unittest.cc +++ b/chrome/browser/ui/search/instant_page_unittest.cc @@ -40,7 +40,7 @@ class FakePageDelegate : public InstantPage::Delegate { MOCK_METHOD5(NavigateToURL, void(const content::WebContents* contents, const GURL& url, - content::PageTransition transition, + ui::PageTransition transition, WindowOpenDisposition disposition, bool is_search_type)); }; diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc index 8fb39d6..09aae44 100644 --- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc +++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc @@ -354,7 +354,7 @@ TEST_F(InstantSearchPrerendererTest, UsePrerenderPage) { // the browser swaps the current tab contents with the prerendered contents. GURL url("https://www.google.com/alt#quux=foo&strk"); browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL()); EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle()); @@ -372,7 +372,7 @@ TEST_F(InstantSearchPrerendererTest, PrerenderRequestCancelled) { // Make sure the browser navigates the current tab to this |url|. GURL url("https://www.google.com/alt#quux=foo&strk"); browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL()); EXPECT_EQ(url, GetActiveWebContents()->GetURL()); @@ -387,7 +387,7 @@ TEST_F(InstantSearchPrerendererTest, // tab contents with the prerendered contents. GURL url("https://www.google.com/alt#quux=pen&strk"); browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL()); EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle()); @@ -401,7 +401,7 @@ TEST_F(InstantSearchPrerendererTest, // the active prerender request upon the receipt of empty search query. GURL url("https://www.google.com/alt#quux=&strk"); browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL()); EXPECT_EQ(url, GetActiveWebContents()->GetURL()); @@ -416,7 +416,7 @@ TEST_F(InstantSearchPrerendererTest, // the active prerender request for unsupported window dispositions. GURL url("https://www.google.com/alt#quux=pen&strk"); browser()->OpenURL(content::OpenURLParams(url, Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); content::WebContents* new_tab = browser()->tab_strip_model()->GetWebContentsAt(1); @@ -488,7 +488,7 @@ TEST_F(TestUsePrerenderPage, ExtractSearchTermsAndUsePrerenderPage) { // and uses the prerendered page contents. GURL url("https://www.google.com/alt#quux=foo"); browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL()); EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle()); diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc index d479c98..c4ec74c 100644 --- a/chrome/browser/ui/search/search_tab_helper.cc +++ b/chrome/browser/ui/search/search_tab_helper.cc @@ -45,10 +45,10 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "net/base/net_errors.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" DEFINE_WEB_CONTENTS_USER_DATA_KEY(SearchTabHelper); @@ -620,7 +620,7 @@ void SearchTabHelper::RedirectToLocalNTP() { content::NavigationController::LoadURLParams load_params( (GURL(chrome::kChromeSearchLocalNtpUrl))); load_params.referrer = content::Referrer(); - load_params.transition_type = content::PAGE_TRANSITION_SERVER_REDIRECT; + load_params.transition_type = ui::PAGE_TRANSITION_SERVER_REDIRECT; // Don't push a history entry. load_params.should_replace_current_entry = true; web_contents_->GetController().LoadURLWithParams(load_params); 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 faa6329..c3f812c 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc @@ -32,8 +32,8 @@ namespace { // Returns true if the entry's transition type is FORM_SUBMIT. bool IsFormSubmit(const NavigationEntry* entry) { - return (content::PageTransitionStripQualifier(entry->GetTransitionType()) == - content::PAGE_TRANSITION_FORM_SUBMIT); + return (ui::PageTransitionStripQualifier(entry->GetTransitionType()) == + ui::PAGE_TRANSITION_FORM_SUBMIT); } base::string16 GenerateKeywordFromNavigationEntry( diff --git a/chrome/browser/ui/settings_window_manager.cc b/chrome/browser/ui/settings_window_manager.cc index 5bbae78..c60d5ae 100644 --- a/chrome/browser/ui/settings_window_manager.cc +++ b/chrome/browser/ui/settings_window_manager.cc @@ -46,7 +46,7 @@ void SettingsWindowManager::ShowChromePageForProfile(Profile* profile, return; } NavigateParams params(browser, gurl, - content::PAGE_TRANSITION_AUTO_BOOKMARK); + ui::PAGE_TRANSITION_AUTO_BOOKMARK); params.window_action = NavigateParams::SHOW_WINDOW; params.user_gesture = true; chrome::Navigate(¶ms); @@ -54,7 +54,7 @@ void SettingsWindowManager::ShowChromePageForProfile(Profile* profile, } // No existing browser window, create one. - NavigateParams params(profile, gurl, content::PAGE_TRANSITION_AUTO_BOOKMARK); + NavigateParams params(profile, gurl, ui::PAGE_TRANSITION_AUTO_BOOKMARK); params.disposition = NEW_POPUP; params.trusted_source = true; params.window_action = NavigateParams::SHOW_WINDOW; diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc index 6ccf89e..60cf852 100644 --- a/chrome/browser/ui/singleton_tabs.cc +++ b/chrome/browser/ui/singleton_tabs.cc @@ -61,7 +61,7 @@ void ShowSingletonTabOverwritingNTP(Browser* browser, NavigateParams GetSingletonTabNavigateParams(Browser* browser, const GURL& url) { - NavigateParams params(browser, url, content::PAGE_TRANSITION_AUTO_BOOKMARK); + NavigateParams params(browser, url, ui::PAGE_TRANSITION_AUTO_BOOKMARK); params.disposition = SINGLETON_TAB; params.window_action = NavigateParams::SHOW_WINDOW; params.user_gesture = true; diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc index 6223847..edea11a 100644 --- a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc +++ b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc @@ -48,6 +48,6 @@ bool GoogleApiKeysInfoBarDelegate::LinkClicked( GURL("http://www.chromium.org/developers/how-tos/api-keys"), content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } diff --git a/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc b/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc index 5f3a02e..d10f849 100644 --- a/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc +++ b/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc @@ -66,6 +66,6 @@ bool ObsoleteSystemInfoBarDelegate::LinkClicked( #endif content::Referrer(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); return false; } diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 1c3702b..0e150d0 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -773,7 +773,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( add_types |= TabStripModel::ADD_PINNED; chrome::NavigateParams params(browser, tabs[i].url, - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); params.disposition = first_tab ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; params.tabstrip_add_types = add_types; params.extension_app_id = tabs[i].app_id; diff --git a/chrome/browser/ui/sync/one_click_signin_bubble_links_delegate.cc b/chrome/browser/ui/sync/one_click_signin_bubble_links_delegate.cc index 66e6bce..0712703 100644 --- a/chrome/browser/ui/sync/one_click_signin_bubble_links_delegate.cc +++ b/chrome/browser/ui/sync/one_click_signin_bubble_links_delegate.cc @@ -18,7 +18,7 @@ void OneClickSigninBubbleLinksDelegate::OnLearnMoreLinkClicked( bool is_dialog) { chrome::NavigateParams params(browser_, GURL(chrome::kChromeSyncLearnMoreURL), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); params.disposition = is_dialog ? NEW_WINDOW : NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); } diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc index 1118fab..afbefba 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc @@ -79,7 +79,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/frame_navigate_params.h" -#include "content/public/common/page_transition_types.h" #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" #include "grit/components_strings.h" @@ -88,6 +87,7 @@ #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" @@ -209,7 +209,7 @@ void ConfirmEmailDialogDelegate::OnLinkClicked( GURL(chrome::kChromeSyncMergeTroubleshootingURL), content::Referrer(), NEW_POPUP, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false); // It is guaranteed that |web_contents_| is valid here because when it's // deleted, the dialog is immediately closed and no further action can be @@ -443,7 +443,7 @@ class CurrentHistoryCleaner : public content::WebContentsObserver { virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; private: scoped_ptr<content::WebContents> contents_; @@ -464,7 +464,7 @@ CurrentHistoryCleaner::~CurrentHistoryCleaner() { void CurrentHistoryCleaner::DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { // Return early if this is not top-level navigation. if (render_frame_host->GetParent()) return; @@ -1204,7 +1204,7 @@ void OneClickSigninHelper::RedirectToNtpOrAppsPage( content::OpenURLParams params(url, content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false); contents->OpenURL(params); } @@ -1230,7 +1230,7 @@ void OneClickSigninHelper::RedirectToSignin() { content::WebContents* contents = web_contents(); contents->GetController().LoadURL(page, content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } @@ -1314,7 +1314,7 @@ void OneClickSigninHelper::DidNavigateMainFrame( // If the navigation to a non-sign-in URL hasn't been triggered by the web // contents, the sign in flow has been aborted and the state must be // cleaned (crbug.com/269421). - if (!content::PageTransitionIsWebTriggerable(params.transition) && + if (!ui::PageTransitionIsWebTriggerable(params.transition) && auto_accept_ != AUTO_ACCEPT_NONE) { CleanTransientState(); } diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc index d9ee9b1..a69c8a4 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc @@ -723,7 +723,7 @@ TEST_F(OneClickSigninHelperTest, CleanTransientStateOnNavigate) { content::LoadCommittedDetails details; content::FrameNavigateParams params; params.url = GURL("http://crbug.com"); - params.transition = content::PAGE_TRANSITION_TYPED; + params.transition = ui::PAGE_TRANSITION_TYPED; helper->DidNavigateMainFrame(details, params); EXPECT_EQ(OneClickSigninHelper::AUTO_ACCEPT_NONE, helper->auto_accept_); @@ -735,7 +735,7 @@ TEST_F(OneClickSigninHelperTest, NoRedirectToNTPWithPendingEntry) { const GURL fooWebUIURL("chrome://foo"); controller.LoadURL(fooWebUIURL, content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(fooWebUIURL, controller.GetPendingEntry()->GetURL()); MockWebContentsDelegate delegate; diff --git a/chrome/browser/ui/sync/one_click_signin_sync_observer.cc b/chrome/browser/ui/sync/one_click_signin_sync_observer.cc index 254d991..5774def 100644 --- a/chrome/browser/ui/sync/one_click_signin_sync_observer.cc +++ b/chrome/browser/ui/sync/one_click_signin_sync_observer.cc @@ -95,7 +95,7 @@ void OneClickSigninSyncObserver::LoadContinueUrl() { web_contents()->GetController().LoadURL( continue_url_, content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc index 24ca39f..98a1c98 100644 --- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc +++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc @@ -599,7 +599,7 @@ void OneClickSigninSyncStarter::ShowSettingsPageInWebContents( content::OpenURLParams params(url, content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false); contents->OpenURL(params); @@ -615,6 +615,6 @@ void OneClickSigninSyncStarter::LoadContinueUrl() { web_contents()->GetController().LoadURL( continue_url_, content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc index 87e476a..62d926c 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc @@ -243,7 +243,7 @@ TEST_F(ProfileSigninConfirmationHelperTest, base::snprintf(buf, arraysize(buf), "http://foo.com/%d", i); history->AddPage( GURL(std::string(buf)), base::Time::Now(), NULL, 1, - GURL(), history::RedirectList(), content::PAGE_TRANSITION_LINK, + GURL(), history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); } EXPECT_TRUE( @@ -264,7 +264,7 @@ TEST_F(ProfileSigninConfirmationHelperTest, // Profile is new but has a typed URL. history->AddPage( GURL("http://example.com"), base::Time::Now(), NULL, 1, - GURL(), history::RedirectList(), content::PAGE_TRANSITION_TYPED, + GURL(), history::RedirectList(), ui::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false); EXPECT_TRUE( GetCallbackResult( diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc index ee360e9..41cbc7e9 100644 --- a/chrome/browser/ui/tab_contents/core_tab_helper.cc +++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc @@ -242,7 +242,7 @@ void CoreTabHelper::OnRequestThumbnailForContextNodeACK( content::OpenURLParams open_url_params( result, content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); const std::string& content_type = post_content.first; std::string* post_data = &post_content.second; if (!post_data->empty()) { diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc index 30be260..9ea83cc 100644 --- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc +++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc @@ -120,7 +120,7 @@ IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Navigate) { content::OpenURLParams params(GURL("about:blank"), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); browser()->tab_strip_model()->GetActiveWebContents()->OpenURL(params); diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc index b3a596c..b7c60fb 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.cc +++ b/chrome/browser/ui/tabs/tab_strip_model.cc @@ -36,12 +36,12 @@ namespace { // forgotten. This is generally any navigation that isn't a link click (i.e. // any navigation that can be considered to be the start of a new task distinct // from what had previously occurred in that tab). -bool ShouldForgetOpenersForTransition(content::PageTransition transition) { - return transition == content::PAGE_TRANSITION_TYPED || - transition == content::PAGE_TRANSITION_AUTO_BOOKMARK || - transition == content::PAGE_TRANSITION_GENERATED || - transition == content::PAGE_TRANSITION_KEYWORD || - transition == content::PAGE_TRANSITION_AUTO_TOPLEVEL; +bool ShouldForgetOpenersForTransition(ui::PageTransition transition) { + return transition == ui::PAGE_TRANSITION_TYPED || + transition == ui::PAGE_TRANSITION_AUTO_BOOKMARK || + transition == ui::PAGE_TRANSITION_GENERATED || + transition == ui::PAGE_TRANSITION_KEYWORD || + transition == ui::PAGE_TRANSITION_AUTO_TOPLEVEL; } // CloseTracker is used when closing a set of WebContents. It listens for @@ -605,7 +605,7 @@ int TabStripModel::GetIndexOfLastWebContentsOpenedBy(const WebContents* opener, } void TabStripModel::TabNavigating(WebContents* contents, - content::PageTransition transition) { + ui::PageTransition transition) { if (ShouldForgetOpenersForTransition(transition)) { // Don't forget the openers if this tab is a New Tab page opened at the // end of the TabStrip (e.g. by pressing Ctrl+T). Give the user one @@ -783,14 +783,14 @@ void TabStripModel::SetSelectionFromModel( void TabStripModel::AddWebContents(WebContents* contents, int index, - content::PageTransition transition, + ui::PageTransition transition, int add_types) { // If the newly-opened tab is part of the same task as the parent tab, we want // to inherit the parent's "group" attribute, so that if this tab is then // closed we'll jump back to the parent tab. bool inherit_group = (add_types & ADD_INHERIT_GROUP) == ADD_INHERIT_GROUP; - if (transition == content::PAGE_TRANSITION_LINK && + if (transition == ui::PAGE_TRANSITION_LINK && (add_types & ADD_FORCE_INDEX) == 0) { // We assume tabs opened via link clicks are part of the same task as their // parent. Note that when |force_index| is true (e.g. when the user @@ -807,7 +807,7 @@ void TabStripModel::AddWebContents(WebContents* contents, index = count(); } - if (transition == content::PAGE_TRANSITION_TYPED && index == count()) { + if (transition == ui::PAGE_TRANSITION_TYPED && index == count()) { // Also, any tab opened at the end of the TabStrip with a "TYPED" // transition inherit group as well. This covers the cases where the user // creates a New Tab (e.g. Ctrl+T, or clicks the New Tab button), or types @@ -821,7 +821,7 @@ void TabStripModel::AddWebContents(WebContents* contents, // Reset the index, just in case insert ended up moving it on us. index = GetIndexOfWebContents(contents); - if (inherit_group && transition == content::PAGE_TRANSITION_TYPED) + if (inherit_group && transition == ui::PAGE_TRANSITION_TYPED) contents_data_[index]->set_reset_group_on_select(true); // TODO(sky): figure out why this is here and not in InsertWebContentsAt. When diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h index 0865469..2527946 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" -#include "content/public/common/page_transition_types.h" #include "ui/base/models/list_selection_model.h" +#include "ui/base/page_transition_types.h" class Profile; class TabStripModelDelegate; @@ -294,7 +294,7 @@ class TabStripModel { // navigation, the TabStripModel may adjust its selection and grouping // behavior. void TabNavigating(content::WebContents* contents, - content::PageTransition transition); + ui::PageTransition transition); // Forget all Opener relationships that are stored (but _not_ group // relationships!) This is to reduce unpredictable tab switching behavior @@ -382,7 +382,7 @@ class TabStripModel { // append the contents to the end of the tab strip. void AddWebContents(content::WebContents* contents, int index, - content::PageTransition transition, + ui::PageTransition transition, int add_types); // Closes the selected tabs. diff --git a/chrome/browser/ui/tabs/tab_strip_model_delegate.h b/chrome/browser/ui/tabs/tab_strip_model_delegate.h index 4bd8ad2..50e8b93 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_delegate.h +++ b/chrome/browser/ui/tabs/tab_strip_model_delegate.h @@ -7,8 +7,6 @@ #include <vector> -#include "content/public/common/page_transition_types.h" - class Browser; class GURL; diff --git a/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc b/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc index 52e8758..b91b348 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc @@ -20,7 +20,7 @@ TabStripModelOrderController::~TabStripModelOrderController() { } int TabStripModelOrderController::DetermineInsertionIndex( - content::PageTransition transition, + ui::PageTransition transition, bool foreground) { int tab_count = tabstrip_->count(); if (!tab_count) @@ -28,7 +28,7 @@ int TabStripModelOrderController::DetermineInsertionIndex( // NOTE: TabStripModel enforces that all non-mini-tabs occur after mini-tabs, // so we don't have to check here too. - if (transition == content::PAGE_TRANSITION_LINK && + if (transition == ui::PAGE_TRANSITION_LINK && tabstrip_->active_index() != -1) { if (foreground) { // If the page was opened in the foreground by a link click in another diff --git a/chrome/browser/ui/tabs/tab_strip_model_order_controller.h b/chrome/browser/ui/tabs/tab_strip_model_order_controller.h index 60aa416..cfe8e63 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_order_controller.h +++ b/chrome/browser/ui/tabs/tab_strip_model_order_controller.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_TABS_TAB_STRIP_MODEL_ORDER_CONTROLLER_H_ #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" /////////////////////////////////////////////////////////////////////////////// // TabStripModelOrderController @@ -21,7 +21,7 @@ class TabStripModelOrderController : public TabStripModelObserver { // Determine where to place a newly opened tab by using the supplied // transition and foreground flag to figure out how it was opened. - int DetermineInsertionIndex(content::PageTransition transition, + int DetermineInsertionIndex(ui::PageTransition transition, bool foreground); // Determine where to shift selection after a tab is closed. diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index 445f2be..b344bd4 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc @@ -757,7 +757,7 @@ TEST_F(TabStripModelTest, TestBasicOpenerAPI) { static int GetInsertionIndex(TabStripModel* tabstrip) { return tabstrip->order_controller()->DetermineInsertionIndex( - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); } static void InsertWebContentses(TabStripModel* tabstrip, @@ -838,7 +838,7 @@ TEST_F(TabStripModelTest, TestInsertionIndexDetermination) { // opener tab. WebContents* fg_link_contents = CreateWebContents(); int insert_index = tabstrip.order_controller()->DetermineInsertionIndex( - content::PAGE_TRANSITION_LINK, true); + ui::PAGE_TRANSITION_LINK, true); EXPECT_EQ(1, insert_index); tabstrip.InsertWebContentsAt(insert_index, fg_link_contents, TabStripModel::ADD_ACTIVE | @@ -853,7 +853,7 @@ TEST_F(TabStripModelTest, TestInsertionIndexDetermination) { // Now open a new empty tab. It should open at the end of the strip. WebContents* fg_nonlink_contents = CreateWebContents(); insert_index = tabstrip.order_controller()->DetermineInsertionIndex( - content::PAGE_TRANSITION_AUTO_BOOKMARK, true); + ui::PAGE_TRANSITION_AUTO_BOOKMARK, true); EXPECT_EQ(tabstrip.count(), insert_index); // We break the opener relationship... tabstrip.InsertWebContentsAt(insert_index, @@ -1233,13 +1233,13 @@ TEST_F(TabStripModelTest, AddWebContents_MiddleClickLinksAndClose) { // Open the Home Page. WebContents* homepage_contents = CreateWebContents(); tabstrip.AddWebContents( - homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK, + homepage_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK, TabStripModel::ADD_ACTIVE); // Open some other tab, by user typing. WebContents* typed_page_contents = CreateWebContents(); tabstrip.AddWebContents( - typed_page_contents, -1, content::PAGE_TRANSITION_TYPED, + typed_page_contents, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_ACTIVE); EXPECT_EQ(2, tabstrip.count()); @@ -1251,15 +1251,15 @@ TEST_F(TabStripModelTest, AddWebContents_MiddleClickLinksAndClose) { // page. WebContents* middle_click_contents1 = CreateWebContents(); tabstrip.AddWebContents( - middle_click_contents1, -1, content::PAGE_TRANSITION_LINK, + middle_click_contents1, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); WebContents* middle_click_contents2 = CreateWebContents(); tabstrip.AddWebContents( - middle_click_contents2, -1, content::PAGE_TRANSITION_LINK, + middle_click_contents2, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); WebContents* middle_click_contents3 = CreateWebContents(); tabstrip.AddWebContents( - middle_click_contents3, -1, content::PAGE_TRANSITION_LINK, + middle_click_contents3, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); EXPECT_EQ(5, tabstrip.count()); @@ -1303,13 +1303,13 @@ TEST_F(TabStripModelTest, AddWebContents_LeftClickPopup) { // Open the Home Page. WebContents* homepage_contents = CreateWebContents(); tabstrip.AddWebContents( - homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK, + homepage_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK, TabStripModel::ADD_ACTIVE); // Open some other tab, by user typing. WebContents* typed_page_contents = CreateWebContents(); tabstrip.AddWebContents( - typed_page_contents, -1, content::PAGE_TRANSITION_TYPED, + typed_page_contents, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_ACTIVE); EXPECT_EQ(2, tabstrip.count()); @@ -1320,7 +1320,7 @@ TEST_F(TabStripModelTest, AddWebContents_LeftClickPopup) { // Open a tab by simulating a left click on a link that opens in a new tab. WebContents* left_click_contents = CreateWebContents(); tabstrip.AddWebContents(left_click_contents, -1, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_ACTIVE); // Verify the state meets our expectations. @@ -1354,13 +1354,13 @@ TEST_F(TabStripModelTest, AddWebContents_CreateNewBlankTab) { // Open the Home Page. WebContents* homepage_contents = CreateWebContents(); tabstrip.AddWebContents( - homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK, + homepage_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK, TabStripModel::ADD_ACTIVE); // Open some other tab, by user typing. WebContents* typed_page_contents = CreateWebContents(); tabstrip.AddWebContents( - typed_page_contents, -1, content::PAGE_TRANSITION_TYPED, + typed_page_contents, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_ACTIVE); EXPECT_EQ(2, tabstrip.count()); @@ -1371,7 +1371,7 @@ TEST_F(TabStripModelTest, AddWebContents_CreateNewBlankTab) { // Open a new blank tab in the foreground. WebContents* new_blank_contents = CreateWebContents(); tabstrip.AddWebContents(new_blank_contents, -1, - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_ACTIVE); // Verify the state of the tabstrip. @@ -1383,11 +1383,11 @@ TEST_F(TabStripModelTest, AddWebContents_CreateNewBlankTab) { // Now open a couple more blank tabs in the background. WebContents* background_blank_contents1 = CreateWebContents(); tabstrip.AddWebContents( - background_blank_contents1, -1, content::PAGE_TRANSITION_TYPED, + background_blank_contents1, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_NONE); WebContents* background_blank_contents2 = CreateWebContents(); tabstrip.AddWebContents( - background_blank_contents2, -1, content::PAGE_TRANSITION_GENERATED, + background_blank_contents2, -1, ui::PAGE_TRANSITION_GENERATED, TabStripModel::ADD_NONE); EXPECT_EQ(5, tabstrip.count()); EXPECT_EQ(homepage_contents, tabstrip.GetWebContentsAt(0)); @@ -1410,13 +1410,13 @@ TEST_F(TabStripModelTest, AddWebContents_ForgetOpeners) { // Open the Home Page WebContents* homepage_contents = CreateWebContents(); tabstrip.AddWebContents( - homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK, + homepage_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK, TabStripModel::ADD_ACTIVE); // Open some other tab, by user typing. WebContents* typed_page_contents = CreateWebContents(); tabstrip.AddWebContents( - typed_page_contents, -1, content::PAGE_TRANSITION_TYPED, + typed_page_contents, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_ACTIVE); EXPECT_EQ(2, tabstrip.count()); @@ -1428,15 +1428,15 @@ TEST_F(TabStripModelTest, AddWebContents_ForgetOpeners) { // page. WebContents* middle_click_contents1 = CreateWebContents(); tabstrip.AddWebContents( - middle_click_contents1, -1, content::PAGE_TRANSITION_LINK, + middle_click_contents1, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); WebContents* middle_click_contents2 = CreateWebContents(); tabstrip.AddWebContents( - middle_click_contents2, -1, content::PAGE_TRANSITION_LINK, + middle_click_contents2, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); WebContents* middle_click_contents3 = CreateWebContents(); tabstrip.AddWebContents( - middle_click_contents3, -1, content::PAGE_TRANSITION_LINK, + middle_click_contents3, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); // Break out of the context by selecting a tab in a different context. @@ -1475,13 +1475,13 @@ TEST_F(TabStripModelTest, AppendContentsReselectionTest) { // Open the Home Page. WebContents* homepage_contents = CreateWebContents(); tabstrip.AddWebContents( - homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK, + homepage_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK, TabStripModel::ADD_ACTIVE); // Open some other tab, by user typing. WebContents* typed_page_contents = CreateWebContents(); tabstrip.AddWebContents( - typed_page_contents, -1, content::PAGE_TRANSITION_TYPED, + typed_page_contents, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_NONE); // The selected tab should still be the first. @@ -1507,15 +1507,15 @@ TEST_F(TabStripModelTest, ReselectionConsidersChildrenTest) { // Open page A WebContents* page_a_contents = CreateWebContents(); strip.AddWebContents( - page_a_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK, + page_a_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK, TabStripModel::ADD_ACTIVE); // Simulate middle click to open page A.A and A.B WebContents* page_a_a_contents = CreateWebContents(); - strip.AddWebContents(page_a_a_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_a_a_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); WebContents* page_a_b_contents = CreateWebContents(); - strip.AddWebContents(page_a_b_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_a_b_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); // Select page A.A @@ -1524,7 +1524,7 @@ TEST_F(TabStripModelTest, ReselectionConsidersChildrenTest) { // Simulate a middle click to open page A.A.A WebContents* page_a_a_a_contents = CreateWebContents(); - strip.AddWebContents(page_a_a_a_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_a_a_a_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); EXPECT_EQ(page_a_a_a_contents, strip.GetWebContentsAt(2)); @@ -1558,18 +1558,18 @@ TEST_F(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsGroup) { // Open page A WebContents* page_a_contents = CreateWebContents(); strip.AddWebContents(page_a_contents, -1, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, TabStripModel::ADD_ACTIVE); // Open pages B, C and D in the background from links on page A... WebContents* page_b_contents = CreateWebContents(); WebContents* page_c_contents = CreateWebContents(); WebContents* page_d_contents = CreateWebContents(); - strip.AddWebContents(page_b_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_b_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); - strip.AddWebContents(page_c_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_c_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); - strip.AddWebContents(page_d_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_d_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); // Switch to page B's tab. @@ -1577,7 +1577,7 @@ TEST_F(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsGroup) { // Open a New Tab at the end of the strip (simulate Ctrl+T) WebContents* new_contents = CreateWebContents(); - strip.AddWebContents(new_contents, -1, content::PAGE_TRANSITION_TYPED, + strip.AddWebContents(new_contents, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_ACTIVE); EXPECT_EQ(4, strip.GetIndexOfWebContents(new_contents)); @@ -1593,7 +1593,7 @@ TEST_F(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsGroup) { // This is like typing a URL in the address bar and pressing Alt+Enter. The // behavior should be the same as above. WebContents* page_e_contents = CreateWebContents(); - strip.AddWebContents(page_e_contents, -1, content::PAGE_TRANSITION_TYPED, + strip.AddWebContents(page_e_contents, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_ACTIVE); EXPECT_EQ(4, strip.GetIndexOfWebContents(page_e_contents)); @@ -1610,7 +1610,7 @@ TEST_F(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsGroup) { // and the one that was active when the gesture was performed. WebContents* page_f_contents = CreateWebContents(); strip.AddWebContents(page_f_contents, -1, - content::PAGE_TRANSITION_AUTO_BOOKMARK, + ui::PAGE_TRANSITION_AUTO_BOOKMARK, TabStripModel::ADD_ACTIVE); EXPECT_EQ(4, strip.GetIndexOfWebContents(page_f_contents)); @@ -1636,36 +1636,36 @@ TEST_F(TabStripModelTest, NavigationForgetsOpeners) { // Open page A WebContents* page_a_contents = CreateWebContents(); strip.AddWebContents(page_a_contents, -1, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, TabStripModel::ADD_ACTIVE); // Open pages B, C and D in the background from links on page A... WebContents* page_b_contents = CreateWebContents(); WebContents* page_c_contents = CreateWebContents(); WebContents* page_d_contents = CreateWebContents(); - strip.AddWebContents(page_b_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_b_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); - strip.AddWebContents(page_c_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_c_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); - strip.AddWebContents(page_d_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_d_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); // Open page E in a different opener group from page A. WebContents* page_e_contents = CreateWebContents(); strip.AddWebContents(page_e_contents, -1, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, TabStripModel::ADD_NONE); // Tell the TabStripModel that we are navigating page D via a link click. strip.ActivateTabAt(3, true); - strip.TabNavigating(page_d_contents, content::PAGE_TRANSITION_LINK); + strip.TabNavigating(page_d_contents, ui::PAGE_TRANSITION_LINK); // Close page D, page C should be selected. (part of same group). strip.CloseWebContentsAt(3, TabStripModel::CLOSE_NONE); EXPECT_EQ(2, strip.active_index()); // Tell the TabStripModel that we are navigating in page C via a bookmark. - strip.TabNavigating(page_c_contents, content::PAGE_TRANSITION_AUTO_BOOKMARK); + strip.TabNavigating(page_c_contents, ui::PAGE_TRANSITION_AUTO_BOOKMARK); // Close page C, page E should be selected. (C is no longer part of the // A-B-C-D group, selection moves to the right). @@ -1687,17 +1687,17 @@ TEST_F(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) { // opened. WebContents* page_a_contents = CreateWebContents(); strip.AddWebContents(page_a_contents, -1, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, TabStripModel::ADD_ACTIVE); WebContents* page_b_contents = CreateWebContents(); WebContents* page_c_contents = CreateWebContents(); WebContents* page_d_contents = CreateWebContents(); - strip.AddWebContents(page_b_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_b_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); - strip.AddWebContents(page_c_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_c_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); - strip.AddWebContents(page_d_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_d_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); strip.ActivateTabAt(2, true); @@ -1708,7 +1708,7 @@ TEST_F(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) { // Now simulate opening a new tab at the end of the TabStrip. WebContents* new_contents1 = CreateWebContents(); - strip.AddWebContents(new_contents1, -1, content::PAGE_TRANSITION_TYPED, + strip.AddWebContents(new_contents1, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_ACTIVE); // At this point, if we close this tab the last selected one should be @@ -1722,7 +1722,7 @@ TEST_F(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) { // Open a new tab again. WebContents* new_contents2 = CreateWebContents(); - strip.AddWebContents(new_contents2, -1, content::PAGE_TRANSITION_TYPED, + strip.AddWebContents(new_contents2, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_ACTIVE); // Now select the first tab. @@ -2113,7 +2113,7 @@ TEST_F(TabStripModelTest, ReplaceSendsSelected) { TabStripModel strip(&delegate, profile()); WebContents* first_contents = CreateWebContents(); - strip.AddWebContents(first_contents, -1, content::PAGE_TRANSITION_TYPED, + strip.AddWebContents(first_contents, -1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_ACTIVE); MockTabStripModelObserver tabstrip_observer(&strip); @@ -2138,7 +2138,7 @@ TEST_F(TabStripModelTest, ReplaceSendsSelected) { // Now add another tab and replace it, making sure we don't get a selected // event this time. WebContents* third_contents = CreateWebContents(); - strip.AddWebContents(third_contents, 1, content::PAGE_TRANSITION_TYPED, + strip.AddWebContents(third_contents, 1, ui::PAGE_TRANSITION_TYPED, TabStripModel::ADD_NONE); tabstrip_observer.ClearStates(); @@ -2331,19 +2331,19 @@ TEST_F(TabStripModelTest, MoveSelectedTabsTo_ForgetGroups) { // Open page A as a new tab and then A1 in the background from A. WebContents* page_a_contents = CreateWebContents(); strip.AddWebContents(page_a_contents, -1, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, TabStripModel::ADD_ACTIVE); WebContents* page_a1_contents = CreateWebContents(); - strip.AddWebContents(page_a1_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_a1_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); // Likewise, open pages B and B1. WebContents* page_b_contents = CreateWebContents(); strip.AddWebContents(page_b_contents, -1, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, TabStripModel::ADD_ACTIVE); WebContents* page_b1_contents = CreateWebContents(); - strip.AddWebContents(page_b1_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_b1_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); EXPECT_EQ(page_a_contents, strip.GetWebContentsAt(0)); @@ -2356,7 +2356,7 @@ TEST_F(TabStripModelTest, MoveSelectedTabsTo_ForgetGroups) { // Open page B2 in the background from B. It should end up after B. WebContents* page_b2_contents = CreateWebContents(); - strip.AddWebContents(page_b2_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_b2_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); EXPECT_EQ(page_b_contents, strip.GetWebContentsAt(0)); EXPECT_EQ(page_b2_contents, strip.GetWebContentsAt(1)); @@ -2370,7 +2370,7 @@ TEST_F(TabStripModelTest, MoveSelectedTabsTo_ForgetGroups) { // Open page A2 in the background from A. It should end up after A1. WebContents* page_a2_contents = CreateWebContents(); - strip.AddWebContents(page_a2_contents, -1, content::PAGE_TRANSITION_LINK, + strip.AddWebContents(page_a2_contents, -1, ui::PAGE_TRANSITION_LINK, TabStripModel::ADD_NONE); EXPECT_EQ(page_b_contents, strip.GetWebContentsAt(0)); EXPECT_EQ(page_b2_contents, strip.GetWebContentsAt(1)); diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc index af2de92..c80a147 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc @@ -264,9 +264,9 @@ bool ToolbarModelImpl::WouldOmitURLDueToOriginChip() const { visible_entry->GetPageType() == content::PAGE_TYPE_INTERSTITIAL && !pending_entry->GetExtraData(kInterstitialShownKey, &unused)) pending_entry->SetExtraData(kInterstitialShownKey, base::string16()); - const content::PageTransition transition_type = + const ui::PageTransition transition_type = pending_entry->GetTransitionType(); - if ((transition_type & content::PAGE_TRANSITION_TYPED) != 0 && + if ((transition_type & ui::PAGE_TRANSITION_TYPED) != 0 && !pending_entry->GetExtraData(kInterstitialShownKey, &unused)) return false; } diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc index 063b171..a3f534e 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc @@ -199,7 +199,7 @@ void ToolbarModelTest::NavigateAndCheckText( // Check while loading. content::NavigationController* controller = &browser()->tab_strip_model()->GetWebContentsAt(0)->GetController(); - controller->LoadURL(url, content::Referrer(), content::PAGE_TRANSITION_LINK, + controller->LoadURL(url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); ToolbarModel* toolbar_model = browser()->toolbar_model(); EXPECT_EQ(expected_text, toolbar_model->GetText()); @@ -331,7 +331,7 @@ TEST_F(ToolbarModelTest, SearchTermsWhileLoading) { content::NavigationController* controller = &browser()->tab_strip_model()->GetWebContentsAt(0)->GetController(); controller->LoadURL(GURL("https://google.com/search?q=tractor+supply&espv=1"), - content::Referrer(), content::PAGE_TRANSITION_LINK, + content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); ToolbarModel* toolbar_model = browser()->toolbar_model(); controller->GetVisibleEntry()->GetSSL().security_style = diff --git a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc index 0217162..e028595 100644 --- a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc +++ b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc @@ -147,7 +147,7 @@ void InvertBubbleView::OpenLink(const std::string& url, int event_flags) { content::OpenURLParams params( GURL(url), content::Referrer(), disposition == CURRENT_TAB ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); browser_->OpenURL(params); } diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc index 5d9bc99..f09a377 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc @@ -173,7 +173,7 @@ void AppInfoHeaderPanel::ShowAppInWebStore() const { net::AppendQueryParameter(url, extension_urls::kWebstoreSourceField, extension_urls::kLaunchSourceAppListInfoDialog), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); chrome::Navigate(¶ms); } @@ -198,7 +198,7 @@ void AppInfoHeaderPanel::DisplayLicenses() { GURL about_page = extensions::ManifestURL::GetAboutPage(imported_module); DCHECK(about_page != GURL::EmptyGURL()); chrome::NavigateParams params( - profile_, about_page, content::PAGE_TRANSITION_LINK); + profile_, about_page, ui::PAGE_TRANSITION_LINK); chrome::Navigate(¶ms); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 5271b0d..8b044e7 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -60,7 +60,6 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" @@ -69,6 +68,7 @@ #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/base/window_open_disposition.h" @@ -1269,7 +1269,7 @@ void BookmarkBarView::ButtonPressed(views::Button* sender, OpenURLParams params(GURL(chrome::kChromeUIAppsURL), Referrer(), disposition_from_event_flags, - content::PAGE_TRANSITION_AUTO_BOOKMARK, + ui::PAGE_TRANSITION_AUTO_BOOKMARK, false); page_navigator_->OpenURL(params); RecordBookmarkAppsPageOpen(GetBookmarkLaunchLocation()); @@ -1292,7 +1292,7 @@ void BookmarkBarView::ButtonPressed(views::Button* sender, RecordAppLaunch(browser_->profile(), node->url()); OpenURLParams params( node->url(), Referrer(), disposition_from_event_flags, - content::PAGE_TRANSITION_AUTO_BOOKMARK, false); + ui::PAGE_TRANSITION_AUTO_BOOKMARK, false); page_navigator_->OpenURL(params); } else { chrome::OpenAll(GetWidget()->GetNativeWindow(), page_navigator_, node, diff --git a/chrome/browser/ui/views/conflicting_module_view_win.cc b/chrome/browser/ui/views/conflicting_module_view_win.cc index 690c477..f33c7c5 100644 --- a/chrome/browser/ui/views/conflicting_module_view_win.cc +++ b/chrome/browser/ui/views/conflicting_module_view_win.cc @@ -197,7 +197,7 @@ void ConflictingModuleView::ButtonPressed(views::Button* sender, content::OpenURLParams(help_center_url_, content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); EnumerateModulesModel* model = EnumerateModulesModel::GetInstance(); diff --git a/chrome/browser/ui/views/download/download_feedback_dialog_view.cc b/chrome/browser/ui/views/download/download_feedback_dialog_view.cc index d2dff57..bcca84af 100644 --- a/chrome/browser/ui/views/download/download_feedback_dialog_view.cc +++ b/chrome/browser/ui/views/download/download_feedback_dialog_view.cc @@ -155,6 +155,6 @@ void DownloadFeedbackDialogView::LinkClicked( GURL(l10n_util::GetStringUTF8(IDS_SAFE_BROWSING_PRIVACY_POLICY_URL)), content::Referrer(), disposition == CURRENT_TAB ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); navigator_->OpenURL(params); } diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index 14537d0..6b5368e 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -773,7 +773,7 @@ void ExtensionInstallDialogView::LinkClicked(views::Link* source, prompt_->extension()->id()); OpenURLParams params( store_url, Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); navigator_->OpenURL(params); GetWidget()->Close(); diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc index db19d7a..967c1f8 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -67,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) { chrome::Find(browser()); // Open another tab (tab B). - chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, ui::PAGE_TRANSITION_TYPED); chrome::Find(browser()); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), @@ -184,7 +184,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, DISABLED_SelectionRestoreOnTabSwitch) { content::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, ui::PAGE_TRANSITION_TYPED); observer.Wait(); // Show the Find bar. @@ -250,7 +250,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestoreOnTabSwitch) { content::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, ui::PAGE_TRANSITION_TYPED); observer.Wait(); // Make sure Find box is open. diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc index 0ca335e..b54ec16 100644 --- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc +++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc @@ -771,7 +771,7 @@ void GlobalMenuBarX11::OnHistoryItemActivated(DbusmenuMenuitem* sender, item->url, content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_AUTO_BOOKMARK, + ui::PAGE_TRANSITION_AUTO_BOOKMARK, false)); } } diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 430f333..2d5a240 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -1257,7 +1257,7 @@ WindowOpenDisposition LocationBarView::GetWindowOpenDisposition() const { return disposition(); } -content::PageTransition LocationBarView::GetPageTransition() const { +ui::PageTransition LocationBarView::GetPageTransition() const { return transition(); } diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index d7752ac..674e831 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -342,7 +342,7 @@ class LocationBarView : public LocationBar, virtual void ShowFirstRunBubble() OVERRIDE; virtual GURL GetDestinationURL() const OVERRIDE; virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; - virtual content::PageTransition GetPageTransition() const OVERRIDE; + virtual ui::PageTransition GetPageTransition() const OVERRIDE; virtual void AcceptInput() OVERRIDE; virtual void FocusSearch() OVERRIDE; virtual void UpdateContentSettingsIcons() OVERRIDE; diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc b/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc index f785c2f..93cd822 100644 --- a/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc @@ -273,7 +273,7 @@ void ZoomBubbleView::ButtonPressed(views::Button* sender, browser, GURL(base::StringPrintf("chrome://extensions?id=%s", extension_info_.id.c_str())), - content::PAGE_TRANSITION_FROM_API); + ui::PAGE_TRANSITION_FROM_API); } else { chrome_page_zoom::Zoom(web_contents_, content::PAGE_ZOOM_RESET); } diff --git a/chrome/browser/ui/views/network_profile_bubble_view.cc b/chrome/browser/ui/views/network_profile_bubble_view.cc index fd816b6..cdf3354 100644 --- a/chrome/browser/ui/views/network_profile_bubble_view.cc +++ b/chrome/browser/ui/views/network_profile_bubble_view.cc @@ -131,7 +131,7 @@ void NetworkProfileBubbleView::LinkClicked(views::Link* source, "common-problems-and-solutions#network_profile"), content::Referrer(), disposition == CURRENT_TAB ? NEW_FOREGROUND_TAB : disposition, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); navigator_->OpenURL(params); // If the user interacted with the bubble we don't reduce the number of diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc index 5fd284a..452385f 100644 --- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc +++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc @@ -214,7 +214,7 @@ void OutdatedUpgradeBubbleView::HandleButtonPressed(views::Button* sender) { navigator_->OpenURL(content::OpenURLParams(GURL(kDownloadChromeUrl), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); #if defined(OS_WIN) } else { diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc index 9aa2aa8..258611f 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc @@ -277,7 +277,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, TwoTabsWithBubble) { SetupPendingPassword(); EXPECT_TRUE(ManagePasswordsBubbleView::IsShowing()); // Set up the second tab. - AddTabAtIndex(0, GURL("chrome://newtab"), content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL("chrome://newtab"), ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(ManagePasswordsBubbleView::IsShowing()); ManagePasswordsBubbleView::ShowBubble( browser()->tab_strip_model()->GetActiveWebContents(), diff --git a/chrome/browser/ui/views/profiles/profile_reset_bubble_view.cc b/chrome/browser/ui/views/profiles/profile_reset_bubble_view.cc index 2b039f2..0cf103e 100644 --- a/chrome/browser/ui/views/profiles/profile_reset_bubble_view.cc +++ b/chrome/browser/ui/views/profiles/profile_reset_bubble_view.cc @@ -423,7 +423,7 @@ void ProfileResetBubbleView::LinkClicked(views::Link* source, int flags) { base::UserMetricsAction("SettingsResetBubble.LearnMore")); navigator_->OpenURL(content::OpenURLParams( GURL(chrome::kResetProfileSettingsLearnMoreURL), content::Referrer(), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false)); + NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false)); } void ProfileResetBubbleView::CloseBubbleView() { diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index b14de22..173455e 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -178,7 +178,7 @@ void SadTabView::LinkClicked(views::Link* source, int event_flags) { chrome::kCrashReasonURL : chrome::kKillReasonURL); OpenURLParams params( help_url, content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); web_contents_->OpenURL(params); } else if (source == feedback_link_) { chrome::ShowFeedbackPage( diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc index 9919fdb..0e97597 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc @@ -333,7 +333,7 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, // Open a singleton tab in background. chrome::NavigateParams p(browser(), GURL("http://www.google.com"), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); p.window_action = chrome::NavigateParams::SHOW_WINDOW; p.disposition = SINGLETON_TAB; chrome::Navigate(&p); diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc index ef43a73..fbccada 100644 --- a/chrome/browser/ui/views/session_crashed_bubble_view.cc +++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc @@ -375,7 +375,7 @@ void SessionCrashedBubbleView::StyledLabelLinkClicked(const gfx::Range& range, GURL("https://support.google.com/chrome/answer/96817"), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_HELP); } diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index 56dd4fd5..4d23f07 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc @@ -151,8 +151,8 @@ class SSLClientCertificateSelectorMultiTabTest // Also calls SetUpOnIOThread. SSLClientCertificateSelectorTest::SetUpOnMainThread(); - AddTabAtIndex(1, GURL("about:blank"), content::PAGE_TRANSITION_LINK); - AddTabAtIndex(2, GURL("about:blank"), content::PAGE_TRANSITION_LINK); + AddTabAtIndex(1, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); + AddTabAtIndex(2, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(0)); ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(1)); ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(2)); diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc b/chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc index 468b553..59dabbc 100644 --- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc @@ -9,7 +9,6 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/sync/one_click_signin_bubble_delegate.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/public/common/page_transition_types.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc index 3d70bab..3fffef5 100644 --- a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc +++ b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc @@ -252,7 +252,7 @@ void ProfileSigninConfirmationDialogViews::StyledLabelLinkClicked( chrome::NavigateParams params( browser_, GURL("http://support.google.com/chromeos/bin/answer.py?answer=1331549"), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); params.disposition = NEW_POPUP; params.window_action = chrome::NavigateParams::SHOW_WINDOW; chrome::Navigate(¶ms); diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 26e82b2..ec84d5f 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -339,7 +339,7 @@ void BrowserTabStripController::OnDropIndexUpdate(int index, void BrowserTabStripController::PerformDrop(bool drop_before, int index, const GURL& url) { - chrome::NavigateParams params(browser_, url, content::PAGE_TRANSITION_LINK); + chrome::NavigateParams params(browser_, url, ui::PAGE_TRANSITION_LINK); params.tabstrip_index = index; if (drop_before) { diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc index 90588a9..8aff6d0 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc @@ -365,7 +365,7 @@ void TranslateBubbleView::HandleLinkClicked( url, content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); break; } diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc index dfd5c07..aabc7aa 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc @@ -405,7 +405,7 @@ void WebsiteSettingsPopupView::LinkClicked(views::Link* source, content::OpenURLParams(GURL(chrome::kPageInfoHelpCenterURL), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); } } diff --git a/chrome/browser/ui/webui/chrome_web_contents_handler.cc b/chrome/browser/ui/webui/chrome_web_contents_handler.cc index 36c632b..c733afe 100644 --- a/chrome/browser/ui/webui/chrome_web_contents_handler.cc +++ b/chrome/browser/ui/webui/chrome_web_contents_handler.cc @@ -53,7 +53,7 @@ WebContents* ChromeWebContentsHandler::OpenURLFromTab( nav_params.referrer = params.referrer; if (source && source->IsCrashed() && params.disposition == CURRENT_TAB && - params.transition == content::PAGE_TRANSITION_LINK) { + params.transition == ui::PAGE_TRANSITION_LINK) { nav_params.disposition = NEW_FOREGROUND_TAB; } else { nav_params.disposition = params.disposition; diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc index 845b425..2423864 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc @@ -363,7 +363,7 @@ void KeyboardOverlayHandler::OpenLearnMorePage(const base::ListValue* args) { content::OpenURLParams(GURL(kLearnMoreURL), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); } diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 4c1bd51..b1c40c6 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -637,7 +637,7 @@ MobileSetupUI::MobileSetupUI(content::WebUI* web_ui) void MobileSetupUI::DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { if (render_frame_host->GetFrameName() != "paymentForm") return; diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h index b705ff9..5f4c5b1 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h @@ -22,7 +22,7 @@ class MobileSetupUI : public content::WebUIController, virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; virtual void DidFailProvisionalLoad( content::RenderFrameHost* render_frame_host, const GURL& validated_url, diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc index 1b7244d..a2b05b9 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc +++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc @@ -48,7 +48,7 @@ ConstrainedWebDialogDelegateBase::ConstrainedWebDialogDelegateBase( web_contents_->GetController().LoadURL(delegate->GetDialogContentURL(), content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc index 4feb3b3..2564a05 100644 --- a/chrome/browser/ui/webui/inspect_ui.cc +++ b/chrome/browser/ui/webui/inspect_ui.cc @@ -349,7 +349,7 @@ void InspectUI::InspectBrowserWithCustomFrontend( content::OpenURLParams(frontend_url, content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); // Install devtools bindings. diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc index 255188d..a76e549 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc @@ -36,12 +36,12 @@ #include "components/signin/core/browser/signin_manager_base.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" -#include "content/public/common/page_transition_types.h" #include "net/base/host_port_pair.h" #include "net/base/net_util.h" #include "net/base/url_util.h" #include "net/http/http_status_code.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/page_transition_types.h" #if defined(ENABLE_FULL_PRINTING) && !defined(OS_CHROMEOS) #define CLOUD_PRINT_CONNECTOR_UI_AVAILABLE @@ -291,7 +291,7 @@ void LocalDiscoveryUIHandler::HandleOpenCloudPrintURL( chrome::AddSelectedTabWithURL(browser, cloud_devices::GetCloudPrintManageDeviceURL(id), - content::PAGE_TRANSITION_FROM_API); + ui::PAGE_TRANSITION_FROM_API); } void LocalDiscoveryUIHandler::HandleShowSyncUI( @@ -305,7 +305,7 @@ void LocalDiscoveryUIHandler::HandleShowSyncUI( browser->OpenURL( content::OpenURLParams(url, content::Referrer(), SINGLETON_TAB, - content::PAGE_TRANSITION_AUTO_BOOKMARK, false)); + ui::PAGE_TRANSITION_AUTO_BOOKMARK, false)); } void LocalDiscoveryUIHandler::StartRegisterHTTP( @@ -686,7 +686,7 @@ void LocalDiscoveryUIHandler::ShowCloudPrintSetupDialog( CloudPrintProxyServiceFactory::GetForProfile(profile)->proxy_id()), content::Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); web_ui()->GetWebContents()->OpenURL(params); } diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index 9a06e98..a0426ba 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -62,7 +62,7 @@ MostVisitedHandler::~MostVisitedHandler() { web_ui()->GetWebContents()->GetController().GetLastCommittedEntry(); if (entry && (entry->GetURL() != ntp_url)) { action_id = - content::PageTransitionStripQualifier(entry->GetTransitionType()); + ui::PageTransitionStripQualifier(entry->GetTransitionType()); } UMA_HISTOGRAM_ENUMERATION("NewTabPage.MostVisitedAction", action_id, diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index af6dda1..e8e4e80 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -90,7 +90,7 @@ NewTabUI::NewTabUI(content::WebUI* web_ui) // We count all link clicks as AUTO_BOOKMARK, so that site can be ranked more // highly. Note this means we're including clicks on not only most visited // thumbnails, but also clicks on recently bookmarked. - web_ui->SetLinkTransitionType(content::PAGE_TRANSITION_AUTO_BOOKMARK); + web_ui->SetLinkTransitionType(ui::PAGE_TRANSITION_AUTO_BOOKMARK); Profile* profile = GetProfile(); if (!profile->IsOffTheRecord()) { diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc index 5238c49..a7873aa 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc @@ -58,7 +58,7 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, DISABLED_LoadNTPInExistingProcess) { content::RenderProcessHostWatcher::WATCH_FOR_HOST_DESTRUCTION); browser()->OpenURL(OpenURLParams( test_server()->GetURL("files/title1.html"), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); process_exited_observer.Wait(); } @@ -113,7 +113,7 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, DISABLED_ChromeHangInNTP) { chrome::NewTab(browser()); browser()->OpenURL(OpenURLParams( GURL(content::kChromeUIHangURL), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); } class NewTabUIProcessPerTabTest : public NewTabUIBrowserTest { @@ -147,6 +147,6 @@ IN_PROC_BROWSER_TEST_F(NewTabUIProcessPerTabTest, NavBeforeNTPCommits) { browser()->tab_strip_model()->GetActiveWebContents()); browser()->OpenURL(OpenURLParams( GURL("data:text/html,hello world"), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + ui::PAGE_TRANSITION_TYPED, false)); observer.Wait(); } diff --git a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc index ba02ac8..4d606fe 100644 --- a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc @@ -33,7 +33,7 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" using base::UserMetricsAction; @@ -52,7 +52,7 @@ SuggestionsHandler::~SuggestionsHandler() { web_ui()->GetWebContents()->GetController().GetLastCommittedEntry(); if (entry && (entry->GetURL() != ntp_url)) { action_id = - content::PageTransitionStripQualifier(entry->GetTransitionType()); + ui::PageTransitionStripQualifier(entry->GetTransitionType()); } UMA_HISTOGRAM_ENUMERATION("NewTabPage.SuggestedSitesAction", action_id, diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc b/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc index 799dbe2..0f7c4b7 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc @@ -52,7 +52,7 @@ void ShowLinuxProxyConfigUrl(int render_process_id, int render_view_id) { LOG(ERROR) << "Could not find " << name << " network settings in $PATH"; OpenURLParams params( GURL(kLinuxProxyConfigUrl), Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + ui::PAGE_TRANSITION_LINK, false); WebContents* web_contents = tab_util::GetWebContentsByID(render_process_id, render_view_id); diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 03fcbe3..4af7dda 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -1594,7 +1594,7 @@ void BrowserOptionsHandler::ShowCloudPrintDevicesPage( // Navigate in current tab to devices page. OpenURLParams params( GURL(chrome::kChromeUIDevicesURL), Referrer(), - CURRENT_TAB, content::PAGE_TRANSITION_LINK, false); + CURRENT_TAB, ui::PAGE_TRANSITION_LINK, false); web_ui()->GetWebContents()->OpenURL(params); } diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc index cd4454f..561670b 100644 --- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc @@ -240,7 +240,7 @@ void CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback( content::OpenURLParams params(ime->options_page_url(), content::Referrer(), SINGLETON_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); browser->OpenURL(params); browser->window()->Show(); diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index f78549f..8fd7808 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -1022,7 +1022,7 @@ void PrintPreviewHandler::HandleManageCloudPrint( cloud_devices::GetCloudPrintRelativeURL("manage.html"), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); } @@ -1119,7 +1119,7 @@ void PrintPreviewHandler::HandleForceOpenNewTab(const base::ListValue* args) { return; chrome::AddSelectedTabWithURL(browser, GURL(url), - content::PAGE_TRANSITION_LINK); + ui::PAGE_TRANSITION_LINK); } void PrintPreviewHandler::SendInitialSettings( diff --git a/chrome/browser/ui/webui/signin/inline_login_handler.cc b/chrome/browser/ui/webui/signin/inline_login_handler.cc index 67bc079..6a16e1e 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc @@ -120,7 +120,7 @@ void InlineLoginHandler::HandleSwitchToFullTabMessage( Profile::FromWebUI(web_ui()), net::AppendOrReplaceQueryParameter( main_frame_url, signin::kSignInPromoQueryKeyConstrained, "0"), - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); chrome::Navigate(¶ms); web_ui()->CallJavascriptFunction("inline.login.closeDialog"); diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc index 6a4a169..084c30b 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc @@ -240,7 +240,7 @@ bool InlineLoginHandlerImpl::HandleContextMenu( void InlineLoginHandlerImpl::DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { if (!web_contents()) return; diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h index 9f3c44d..b0a0abc 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h @@ -51,7 +51,7 @@ class InlineLoginHandlerImpl : public InlineLoginHandler, virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; // True if the user has navigated to untrusted domains during the signin // process. diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc index da403f8..1389a0f 100644 --- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc +++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc @@ -199,10 +199,10 @@ class TestWebUI : public content::WebUI { return temp_string_; } virtual void OverrideTitle(const base::string16& title) OVERRIDE {} - virtual content::PageTransition GetLinkTransitionType() const OVERRIDE { - return content::PAGE_TRANSITION_LINK; + virtual ui::PageTransition GetLinkTransitionType() const OVERRIDE { + return ui::PAGE_TRANSITION_LINK; } - virtual void SetLinkTransitionType(content::PageTransition type) OVERRIDE {} + virtual void SetLinkTransitionType(ui::PageTransition type) OVERRIDE {} virtual int GetBindings() const OVERRIDE { return 0; } diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc index ac28b7d..98a87b4 100644 --- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc +++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc @@ -66,7 +66,7 @@ TEST_F(WebDialogWebContentsDelegateTest, DoNothingMethodsTest) { EXPECT_TRUE(test_web_contents_delegate_->IsPopupOrPanel(NULL)); history::HistoryAddPageArgs should_add_args( GURL(), base::Time::Now(), 0, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_TYPED, history::SOURCE_SYNCED, false); + ui::PAGE_TRANSITION_TYPED, history::SOURCE_SYNCED, false); test_web_contents_delegate_->NavigationStateChanged( NULL, content::InvalidateTypes(0)); test_web_contents_delegate_->ActivateContents(NULL); @@ -84,7 +84,7 @@ TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) { OpenURLParams(GURL(url::kAboutBlankURL), Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); // This should create a new foreground tab in the existing browser. EXPECT_EQ(1, browser()->tab_strip_model()->count()); @@ -111,7 +111,7 @@ TEST_F(WebDialogWebContentsDelegateTest, DetachTest) { OpenURLParams(GURL(url::kAboutBlankURL), Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB, gfx::Rect(), false, NULL); diff --git a/chrome/common/instant_types.h b/chrome/common/instant_types.h index 3cf8223..e482a52 100644 --- a/chrome/common/instant_types.h +++ b/chrome/common/instant_types.h @@ -10,7 +10,6 @@ #include "base/basictypes.h" #include "base/strings/string16.h" -#include "content/public/common/page_transition_types.h" #include "url/gurl.h" // ID used by Instant code to refer to objects (e.g. Autocomplete results, Most diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index ce78ad3..25ee700 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -1279,7 +1279,7 @@ bool ChromeContentRendererClient::ShouldFork(WebFrame* frame, bool ChromeContentRendererClient::WillSendRequest( blink::WebFrame* frame, - content::PageTransition transition_type, + ui::PageTransition transition_type, const GURL& url, const GURL& first_party_for_cookies, GURL* new_url) { diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h index 34247ba..f8cfbb0 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -112,7 +112,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient { bool is_server_redirect, bool* send_referrer) OVERRIDE; virtual bool WillSendRequest(blink::WebFrame* frame, - content::PageTransition transition_type, + ui::PageTransition transition_type, const GURL& url, const GURL& first_party_for_cookies, GURL* new_url) OVERRIDE; diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc index 08ba2a0..ed13621 100644 --- a/chrome/renderer/extensions/resource_request_policy.cc +++ b/chrome/renderer/extensions/resource_request_policy.cc @@ -8,7 +8,6 @@ #include "base/strings/stringprintf.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/url_constants.h" -#include "content/public/common/page_transition_types.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" @@ -18,6 +17,7 @@ #include "third_party/WebKit/public/web/WebConsoleMessage.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebFrame.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" namespace extensions { @@ -32,7 +32,7 @@ namespace extensions { bool ResourceRequestPolicy::CanRequestResource( const GURL& resource_url, blink::WebFrame* frame, - content::PageTransition transition_type, + ui::PageTransition transition_type, const ExtensionSet* loaded_extensions) { CHECK(resource_url.SchemeIs(extensions::kExtensionScheme)); @@ -78,7 +78,7 @@ bool ResourceRequestPolicy::CanRequestResource( bool is_dev_tools = page_url.SchemeIs(content::kChromeDevToolsScheme) && !ManifestURL::GetDevToolsPage(extension).is_empty(); bool transition_allowed = - !content::PageTransitionIsWebTriggerable(transition_type); + !ui::PageTransitionIsWebTriggerable(transition_type); // - unreachable web page error page (to allow showing the icon of the // unreachable app on this page) bool is_error_page = frame_url == GURL(content::kUnreachableWebDataURL); diff --git a/chrome/renderer/extensions/resource_request_policy.h b/chrome/renderer/extensions/resource_request_policy.h index d33fd53..0049894 100644 --- a/chrome/renderer/extensions/resource_request_policy.h +++ b/chrome/renderer/extensions/resource_request_policy.h @@ -5,7 +5,7 @@ #ifndef CHROME_RENDERER_EXTENSIONS_RESOURCE_REQUEST_POLICY_H_ #define CHROME_RENDERER_EXTENSIONS_RESOURCE_REQUEST_POLICY_H_ -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" class GURL; @@ -27,7 +27,7 @@ class ResourceRequestPolicy { // than those triggered through UI. static bool CanRequestResource(const GURL& resource_url, blink::WebFrame* frame, - content::PageTransition transition_type, + ui::PageTransition transition_type, const ExtensionSet* loaded_extensions); // Returns true if the chrome-extension-resource:// |resource_url| can be // requested from |frame_url|. diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc index cd120ed..dc180d2 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc @@ -96,7 +96,7 @@ PhishingClassifierDelegate::PhishingClassifierDelegate( content::RenderView* render_view, PhishingClassifier* classifier) : content::RenderViewObserver(render_view), - last_main_frame_transition_(content::PAGE_TRANSITION_LINK), + last_main_frame_transition_(ui::PAGE_TRANSITION_LINK), have_page_text_(false), is_classifying_(false) { g_delegates.Get().insert(this); @@ -240,7 +240,7 @@ void PhishingClassifierDelegate::MaybeStartClassification() { return; } - if (last_main_frame_transition_ & content::PAGE_TRANSITION_FORWARD_BACK) { + if (last_main_frame_transition_ & ui::PAGE_TRANSITION_FORWARD_BACK) { // Skip loads from session history navigation. However, update the // last URL sent to the classifier, so that we'll properly detect // in-page navigations. diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h index 303886d..213d20a 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h @@ -9,9 +9,9 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" -#include "content/public/common/page_transition_types.h" #include "content/public/renderer/render_process_observer.h" #include "content/public/renderer/render_view_observer.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" namespace safe_browsing { @@ -115,7 +115,7 @@ class PhishingClassifierDelegate : public content::RenderViewObserver { // to exclude back/forward loads from classification. Note that this is // set in DidCommitProvisionalLoad(); the transition is reset after this // call in the RenderView, so we need to save off the value. - content::PageTransition last_main_frame_transition_; + ui::PageTransition last_main_frame_transition_; // The URL of the last load that we actually started classification on. // This is used to suppress phishing classification on subframe navigation diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc index 022ad4d..040cb5e 100644 --- a/chrome/test/base/browser_with_test_window_test.cc +++ b/chrome/test/base/browser_with_test_window_test.cc @@ -14,8 +14,8 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/test_renderer_host.h" +#include "ui/base/page_transition_types.h" #if defined(USE_AURA) #include "ui/aura/test/aura_test_helper.h" @@ -121,7 +121,7 @@ void BrowserWithTestWindowTest::TearDown() { } void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) { - chrome::NavigateParams params(browser, url, content::PAGE_TRANSITION_TYPED); + chrome::NavigateParams params(browser, url, ui::PAGE_TRANSITION_TYPED); params.tabstrip_index = 0; params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); @@ -174,7 +174,7 @@ void BrowserWithTestWindowTest::NavigateAndCommit( NavigationController* controller, const GURL& url) { controller->LoadURL( - url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); + url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); CommitPendingLoad(controller); } diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h index cb65ebc..404e94a 100644 --- a/chrome/test/base/browser_with_test_window_test.h +++ b/chrome/test/base/browser_with_test_window_test.h @@ -71,7 +71,7 @@ class WebContents; // // This is equivalent to the above, and lets you test pending navigations. // browser()->OpenURL(OpenURLParams( // GURL("http://foo/2"), GURL(), CURRENT_TAB, -// content::PAGE_TRANSITION_TYPED, false)); +// ui::PAGE_TRANSITION_TYPED, false)); // CommitPendingLoad(controller); // // Subclasses must invoke BrowserWithTestWindowTest::SetUp as it is responsible diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index 45b221d..f78058c 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -288,7 +288,7 @@ void InProcessBrowserTest::AddTabAtIndexToBrowser( Browser* browser, int index, const GURL& url, - content::PageTransition transition) { + ui::PageTransition transition) { chrome::NavigateParams params(browser, url, transition); params.tabstrip_index = index; params.disposition = NEW_FOREGROUND_TAB; @@ -300,7 +300,7 @@ void InProcessBrowserTest::AddTabAtIndexToBrowser( void InProcessBrowserTest::AddTabAtIndex( int index, const GURL& url, - content::PageTransition transition) { + ui::PageTransition transition) { AddTabAtIndexToBrowser(browser(), index, url, transition); } @@ -351,7 +351,7 @@ void InProcessBrowserTest::AddBlankTabAndShow(Browser* browser) { content::NotificationService::AllSources()); chrome::AddSelectedTabWithURL(browser, GURL(url::kAboutBlankURL), - content::PAGE_TRANSITION_AUTO_TOPLEVEL); + ui::PAGE_TRANSITION_AUTO_TOPLEVEL); observer.Wait(); browser->window()->Show(); diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h index b0217d9..34a1e51 100644 --- a/chrome/test/base/in_process_browser_test.h +++ b/chrome/test/base/in_process_browser_test.h @@ -9,10 +9,10 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_base.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" namespace base { @@ -111,9 +111,9 @@ class InProcessBrowserTest : public content::BrowserTestBase { void AddTabAtIndexToBrowser(Browser* browser, int index, const GURL& url, - content::PageTransition transition); + ui::PageTransition transition); void AddTabAtIndex(int index, const GURL& url, - content::PageTransition transition); + ui::PageTransition transition); // Initializes the contents of the user data directory. Called by SetUp() // after creating the user data directory, but before any browser is launched. diff --git a/chrome/test/base/test_browser_window.cc b/chrome/test/base/test_browser_window.cc index 40eede7..0a159b1 100644 --- a/chrome/test/base/test_browser_window.cc +++ b/chrome/test/base/test_browser_window.cc @@ -61,9 +61,9 @@ WindowOpenDisposition return CURRENT_TAB; } -content::PageTransition +ui::PageTransition TestBrowserWindow::TestLocationBar::GetPageTransition() const { - return content::PAGE_TRANSITION_LINK; + return ui::PAGE_TRANSITION_LINK; } bool TestBrowserWindow::TestLocationBar::ShowPageActionPopup( diff --git a/chrome/test/base/test_browser_window.h b/chrome/test/base/test_browser_window.h index 91315ea..b9c746a 100644 --- a/chrome/test/base/test_browser_window.h +++ b/chrome/test/base/test_browser_window.h @@ -167,7 +167,7 @@ class TestBrowserWindow : public BrowserWindow { virtual void ShowFirstRunBubble() OVERRIDE {} virtual GURL GetDestinationURL() const OVERRIDE; virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; - virtual content::PageTransition GetPageTransition() const OVERRIDE; + virtual ui::PageTransition GetPageTransition() const OVERRIDE; virtual void AcceptInput() OVERRIDE {} virtual void FocusLocation(bool select_all) OVERRIDE {} virtual void FocusSearch() OVERRIDE {} diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 6e7a1ce..b295a00 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -169,7 +169,7 @@ void NavigateToURL(chrome::NavigateParams* params) { void NavigateToURLWithPost(Browser* browser, const GURL& url) { chrome::NavigateParams params(browser, url, - content::PAGE_TRANSITION_FORM_SUBMIT); + ui::PAGE_TRANSITION_FORM_SUBMIT); params.uses_post = true; NavigateToURL(¶ms); } @@ -205,7 +205,7 @@ static void NavigateToURLWithDispositionBlockUntilNavigationsComplete( content::NotificationService::AllSources()); browser->OpenURL(OpenURLParams( - url, Referrer(), disposition, content::PAGE_TRANSITION_TYPED, false)); + url, Referrer(), disposition, ui::PAGE_TRANSITION_TYPED, false)); if (browser_test_flags & BROWSER_TEST_WAIT_FOR_BROWSER) browser = WaitForBrowserNotInSet(initial_browsers); if (browser_test_flags & BROWSER_TEST_WAIT_FOR_TAB) diff --git a/chrome/test/base/web_ui_browser_test.cc b/chrome/test/base/web_ui_browser_test.cc index cf9a2aa..997c14a 100644 --- a/chrome/test/base/web_ui_browser_test.cc +++ b/chrome/test/base/web_ui_browser_test.cc @@ -214,7 +214,7 @@ void WebUIBrowserTest::BrowsePreload(const GURL& browse_to) { web_contents, this, preload_test_fixture_, preload_test_name_); content::TestNavigationObserver navigation_observer(web_contents); chrome::NavigateParams params( - browser(), GURL(browse_to), content::PAGE_TRANSITION_TYPED); + browser(), GURL(browse_to), ui::PAGE_TRANSITION_TYPED); params.disposition = CURRENT_TAB; chrome::Navigate(¶ms); navigation_observer.Wait(); diff --git a/chrome/test/data/webui/history_ui_browsertest.cc b/chrome/test/data/webui/history_ui_browsertest.cc index a8b0c77..9477338 100644 --- a/chrome/test/data/webui/history_ui_browsertest.cc +++ b/chrome/test/data/webui/history_ui_browsertest.cc @@ -38,7 +38,7 @@ void HistoryUIBrowserTest::AddPageToHistory( base::Time time = baseline_time_ + base::TimeDelta::FromHours(hour_offset); GURL gurl = GURL(url); history_->AddPage(gurl, time, id_scope, page_id_++, GURL(), - history::RedirectList(), content::PAGE_TRANSITION_LINK, + history::RedirectList(), ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, false); history_->SetPageTitle(gurl, base::UTF8ToUTF16(title)); } diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc index e9e1712..f906aca 100644 --- a/chrome/test/gpu/webgl_infobar_browsertest.cc +++ b/chrome/test/gpu/webgl_infobar_browsertest.cc @@ -25,10 +25,10 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/common/content_paths.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_utils.h" #include "gpu/config/gpu_test_config.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" #include "ui/gl/gl_implementation.h" namespace { @@ -42,9 +42,9 @@ void SimulateGPUCrash(Browser* browser) { chrome::NavigateParams params( browser, GURL(content::kChromeUIGpuCrashURL), - static_cast<content::PageTransition>( - content::PAGE_TRANSITION_TYPED | - content::PAGE_TRANSITION_FROM_ADDRESS_BAR)); + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_TYPED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)); params.disposition = NEW_BACKGROUND_TAB; chrome::Navigate(¶ms); } diff --git a/chrome/test/perf/mach_ports_performancetest.cc b/chrome/test/perf/mach_ports_performancetest.cc index 8208a4f..e80b943 100644 --- a/chrome/test/perf/mach_ports_performancetest.cc +++ b/chrome/test/perf/mach_ports_performancetest.cc @@ -75,7 +75,7 @@ class MachPortsTest : public InProcessBrowserTest { // Adds a tab from the page cycler data at the specified domain. void AddTab(const std::string& domain) { GURL url = server_.GetURL("files/" + domain + "/").Resolve("?skip"); - AddTabAtIndex(0, url, content::PageTransition::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); } private: diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc index 82f12a8..0c80b23 100644 --- a/chrome/test/ppapi/ppapi_browsertest.cc +++ b/chrome/test/ppapi/ppapi_browsertest.cc @@ -1115,7 +1115,7 @@ TEST_PPAPI_NACL(View_CreatedVisible); IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_CreateInvisible) { // Make a second tab in the foreground. GURL url = GetTestFileUrl("View_CreatedInvisible"); - chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); + chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK); params.disposition = NEW_BACKGROUND_TAB; ui_test_utils::NavigateToURL(¶ms); } @@ -1138,7 +1138,7 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, DISABLED_View_PageHideShow) { // Make a new tab to cause the original one to hide, this should trigger the // next phase of the test. chrome::NavigateParams params( - browser(), GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_LINK); + browser(), GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; ui_test_utils::NavigateToURL(¶ms); diff --git a/chromecast/service/cast_service_simple.cc b/chromecast/service/cast_service_simple.cc index 16b14b6..935c54e 100644 --- a/chromecast/service/cast_service_simple.cc +++ b/chromecast/service/cast_service_simple.cc @@ -115,7 +115,7 @@ void CastServiceSimple::StartInternal() { web_contents_->GetController().LoadURL(GetStartupURL(), content::Referrer(), - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, std::string()); } diff --git a/chromecast/shell/browser/android/cast_window_android.cc b/chromecast/shell/browser/android/cast_window_android.cc index 4bf98c2..1ecc1c9 100644 --- a/chromecast/shell/browser/android/cast_window_android.cc +++ b/chromecast/shell/browser/android/cast_window_android.cc @@ -80,9 +80,9 @@ void CastWindowAndroid::Close() { void CastWindowAndroid::LoadURL(const GURL& url) { content::NavigationController::LoadURLParams params(url); - params.transition_type = content::PageTransitionFromInt( - content::PAGE_TRANSITION_TYPED | - content::PAGE_TRANSITION_FROM_ADDRESS_BAR); + params.transition_type = ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_TYPED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); web_contents_->GetController().LoadURLWithParams(params); web_contents_->Focus(); } diff --git a/chromecast/shell/browser/test/chromecast_browser_test.cc b/chromecast/shell/browser/test/chromecast_browser_test.cc index bb1ab5d..1925075 100644 --- a/chromecast/shell/browser/test/chromecast_browser_test.cc +++ b/chromecast/shell/browser/test/chromecast_browser_test.cc @@ -58,9 +58,9 @@ void ChromecastBrowserTest::NavigateToURL(content::WebContents* window, content::WaitForLoadStop(window); content::TestNavigationObserver same_tab_observer(window, 1); content::NavigationController::LoadURLParams params(url); - params.transition_type = content::PageTransitionFromInt( - content::PAGE_TRANSITION_TYPED | - content::PAGE_TRANSITION_FROM_ADDRESS_BAR); + params.transition_type = ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_TYPED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); window->GetController().LoadURLWithParams(params); same_tab_observer.Wait(); } diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc index 86ff377..a4720aa 100644 --- a/components/autofill/content/renderer/password_autofill_agent.cc +++ b/components/autofill/content/renderer/password_autofill_agent.cc @@ -17,7 +17,6 @@ #include "components/autofill/core/common/password_autofill_util.h" #include "components/autofill/core/common/password_form.h" #include "components/autofill/core/common/password_form_fill_data.h" -#include "content/public/common/page_transition_types.h" #include "content/public/renderer/document_state.h" #include "content/public/renderer/navigation_state.h" #include "content/public/renderer/render_view.h" @@ -33,6 +32,7 @@ #include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" #include "third_party/WebKit/public/web/WebView.h" +#include "ui/base/page_transition_types.h" #include "ui/events/keycodes/keyboard_codes.h" #include "url/gurl.h" @@ -728,7 +728,7 @@ void PasswordAutofillAgent::DidStartProvisionalLoad( frame->provisionalDataSource()); content::NavigationState* navigation_state = document_state->navigation_state(); - if (content::PageTransitionIsWebTriggerable( + if (ui::PageTransitionIsWebTriggerable( navigation_state->transition_type()) && !blink::WebUserGestureIndicator::isProcessingUserGesture()) { // If onsubmit has been called, try and save that form. diff --git a/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc b/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc index 612483c..dd05632 100644 --- a/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc +++ b/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc @@ -140,7 +140,7 @@ class WebContentsMainFrameHelper : public content::WebContentsObserver { virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE { + ui::PageTransition transition_type) OVERRIDE { if (wait_for_document_loaded_) return; if (!render_frame_host->GetParent()) @@ -332,7 +332,7 @@ void DistillerPageWebContentsTest::RunUseCurrentWebContentsTest( current_web_contents->GetController().LoadURL( embedded_test_server()->GetURL(url), content::Referrer(), - content::PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, std::string()); url_loaded_runner.Run(); diff --git a/components/dom_distiller/webui/dom_distiller_handler.cc b/components/dom_distiller/webui/dom_distiller_handler.cc index 0c35167..d70dce47 100644 --- a/components/dom_distiller/webui/dom_distiller_handler.cc +++ b/components/dom_distiller/webui/dom_distiller_handler.cc @@ -80,7 +80,7 @@ void DomDistillerHandler::HandleViewUrl(const base::ListValue* args) { web_ui()->GetWebContents()->GetController().LoadURL( view_url, content::Referrer(), - content::PAGE_TRANSITION_GENERATED, + ui::PAGE_TRANSITION_GENERATED, std::string()); } else { web_ui()->CallJavascriptFunction("domDistiller.onViewUrlFailed"); @@ -96,7 +96,7 @@ void DomDistillerHandler::HandleSelectArticle(const base::ListValue* args) { web_ui()->GetWebContents()->GetController().LoadURL( url, content::Referrer(), - content::PAGE_TRANSITION_GENERATED, + ui::PAGE_TRANSITION_GENERATED, std::string()); } diff --git a/components/navigation_interception.gypi b/components/navigation_interception.gypi index 2a788a8..c2e4f76 100644 --- a/components/navigation_interception.gypi +++ b/components/navigation_interception.gypi @@ -15,6 +15,7 @@ '../content/content.gyp:content_browser', '../content/content.gyp:content_common', '../net/net.gyp:net', + '../ui/base/ui_base.gyp:ui_base', ], 'include_dirs': [ '..', diff --git a/components/navigation_interception/BUILD.gn b/components/navigation_interception/BUILD.gn index 7775c2b..95103e6 100644 --- a/components/navigation_interception/BUILD.gn +++ b/components/navigation_interception/BUILD.gn @@ -19,6 +19,7 @@ static_library("navigation_interception") { "//content/public/browser", "//content/public/common", "//net", + "//ui/base", ] if (is_android) { diff --git a/components/navigation_interception/DEPS b/components/navigation_interception/DEPS index cee4d3e..9aa6e32 100644 --- a/components/navigation_interception/DEPS +++ b/components/navigation_interception/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+jni", "+net", + "+ui/base", "+content/public/browser", "+content/public/common", diff --git a/components/navigation_interception/intercept_navigation_delegate.cc b/components/navigation_interception/intercept_navigation_delegate.cc index bf6dbab..e26a943 100644 --- a/components/navigation_interception/intercept_navigation_delegate.cc +++ b/components/navigation_interception/intercept_navigation_delegate.cc @@ -19,7 +19,7 @@ using base::android::ConvertUTF8ToJavaString; using base::android::ScopedJavaLocalRef; using content::BrowserThread; -using content::PageTransition; +using ui::PageTransition; using content::RenderViewHost; using content::WebContents; diff --git a/components/navigation_interception/intercept_navigation_delegate.h b/components/navigation_interception/intercept_navigation_delegate.h index fc3eef9..71914c2 100644 --- a/components/navigation_interception/intercept_navigation_delegate.h +++ b/components/navigation_interception/intercept_navigation_delegate.h @@ -8,7 +8,6 @@ #include "base/android/jni_weak_ref.h" #include "base/memory/scoped_ptr.h" #include "base/supports_user_data.h" -#include "content/public/common/page_transition_types.h" class GURL; diff --git a/components/navigation_interception/intercept_navigation_resource_throttle.cc b/components/navigation_interception/intercept_navigation_resource_throttle.cc index 8729d2c..3b151ae 100644 --- a/components/navigation_interception/intercept_navigation_resource_throttle.cc +++ b/components/navigation_interception/intercept_navigation_resource_throttle.cc @@ -12,14 +12,14 @@ #include "content/public/browser/resource_controller.h" #include "content/public/browser/resource_request_info.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" +#include "ui/base/page_transition_types.h" using content::BrowserThread; using content::ChildProcessSecurityPolicy; -using content::PageTransition; +using ui::PageTransition; using content::Referrer; using content::RenderProcessHost; using content::ResourceRequestInfo; diff --git a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc index 9715630..54fb91d 100644 --- a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc +++ b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc @@ -20,7 +20,6 @@ #include "content/public/browser/resource_throttle.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/mock_resource_context.h" #include "content/public/test/test_renderer_host.h" #include "net/base/request_priority.h" diff --git a/components/navigation_interception/navigation_params.cc b/components/navigation_interception/navigation_params.cc index 2bb0e94..f114ee4 100644 --- a/components/navigation_interception/navigation_params.cc +++ b/components/navigation_interception/navigation_params.cc @@ -15,7 +15,7 @@ NavigationParams::NavigationParams( const content::Referrer& referrer, bool has_user_gesture, bool is_post, - content::PageTransition transition_type, + ui::PageTransition transition_type, bool is_redirect) : url_(url), referrer_(referrer), diff --git a/components/navigation_interception/navigation_params.h b/components/navigation_interception/navigation_params.h index 0144a5a..104de09 100644 --- a/components/navigation_interception/navigation_params.h +++ b/components/navigation_interception/navigation_params.h @@ -5,9 +5,9 @@ #ifndef COMPONENTS_NAVIGATION_INTERCEPTION_NAVIGATION_PARAMS_H_ #define COMPONENTS_NAVIGATION_INTERCEPTION_NAVIGATION_PARAMS_H_ -#include "content/public/common/page_transition_types.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" +#include "ui/base/page_transition_types.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" namespace navigation_interception { @@ -18,7 +18,7 @@ class NavigationParams { const content::Referrer& referrer, bool has_user_gesture, bool is_post, - content::PageTransition page_transition_type, + ui::PageTransition page_transition_type, bool is_redirect); NavigationParams(const NavigationParams& other); void operator=(const NavigationParams& rhs); @@ -28,7 +28,7 @@ class NavigationParams { const content::Referrer& referrer() const { return referrer_; } bool has_user_gesture() const { return has_user_gesture_; } bool is_post() const { return is_post_; } - content::PageTransition transition_type() const { return transition_type_; } + ui::PageTransition transition_type() const { return transition_type_; } bool is_redirect() const { return is_redirect_; } private: @@ -38,7 +38,7 @@ class NavigationParams { content::Referrer referrer_; bool has_user_gesture_; bool is_post_; - content::PageTransition transition_type_; + ui::PageTransition transition_type_; bool is_redirect_; }; diff --git a/components/omnibox/DEPS b/components/omnibox/DEPS index 7163423..c8b3323 100644 --- a/components/omnibox/DEPS +++ b/components/omnibox/DEPS @@ -10,10 +10,3 @@ include_rules = [ "+ui/base", "+url", ] - -specific_include_rules = { - "autocomplete_match.\h": [ - # For content::PageTransition enum. crbug.com/372373 - "!content/public/common/page_transition_types.h", - ], -} diff --git a/components/omnibox/autocomplete_match.cc b/components/omnibox/autocomplete_match.cc index f1c31f2..8a73913 100644 --- a/components/omnibox/autocomplete_match.cc +++ b/components/omnibox/autocomplete_match.cc @@ -42,7 +42,7 @@ AutocompleteMatch::AutocompleteMatch() typed_count(-1), deletable(false), allowed_to_be_default_match(false), - transition(content::PAGE_TRANSITION_GENERATED), + transition(ui::PAGE_TRANSITION_GENERATED), is_history_what_you_typed_match(false), type(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED), from_previous(false) { @@ -57,7 +57,7 @@ AutocompleteMatch::AutocompleteMatch(AutocompleteProvider* provider, typed_count(-1), deletable(deletable), allowed_to_be_default_match(false), - transition(content::PAGE_TRANSITION_TYPED), + transition(ui::PAGE_TRANSITION_TYPED), is_history_what_you_typed_match(false), type(type), from_previous(false) { @@ -435,7 +435,7 @@ void AutocompleteMatch::GetKeywordUIState( base::string16 AutocompleteMatch::GetSubstitutingExplicitlyInvokedKeyword( TemplateURLService* template_url_service) const { - if (transition != content::PAGE_TRANSITION_KEYWORD || + if (transition != ui::PAGE_TRANSITION_KEYWORD || template_url_service == NULL) { return base::string16(); } diff --git a/components/omnibox/autocomplete_match.h b/components/omnibox/autocomplete_match.h index 118d939..cb1f6e4 100644 --- a/components/omnibox/autocomplete_match.h +++ b/components/omnibox/autocomplete_match.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "components/omnibox/autocomplete_match_type.h" #include "components/search_engines/template_url.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" class AutocompleteProvider; @@ -324,7 +324,7 @@ struct AutocompleteMatch { // The transition type to use when the user opens this match. By default // this is TYPED. Providers whose matches do not look like URLs should set // it to GENERATED. - content::PageTransition transition; + ui::PageTransition transition; // True when this match is the "what you typed" match from the history // system. diff --git a/components/omnibox/autocomplete_result.cc b/components/omnibox/autocomplete_result.cc index 41ab4d0..3548855 100644 --- a/components/omnibox/autocomplete_result.cc +++ b/components/omnibox/autocomplete_result.cc @@ -373,7 +373,7 @@ GURL AutocompleteResult::ComputeAlternateNavUrl( const AutocompleteMatch& match) { return ((input.type() == metrics::OmniboxInputType::UNKNOWN) && (AutocompleteMatch::IsSearchType(match.type)) && - (match.transition != content::PAGE_TRANSITION_KEYWORD) && + (match.transition != ui::PAGE_TRANSITION_KEYWORD) && (input.canonicalized_url() != match.destination_url)) ? input.canonicalized_url() : GURL(); } diff --git a/components/omnibox/base_search_provider.cc b/components/omnibox/base_search_provider.cc index dfc26a5..76792e5 100644 --- a/components/omnibox/base_search_provider.cc +++ b/components/omnibox/base_search_provider.cc @@ -268,7 +268,7 @@ AutocompleteMatch BaseSearchProvider::CreateSearchSuggestion( // Search results don't look like URLs. match.transition = suggestion.from_keyword_provider() ? - content::PAGE_TRANSITION_KEYWORD : content::PAGE_TRANSITION_GENERATED; + ui::PAGE_TRANSITION_KEYWORD : ui::PAGE_TRANSITION_GENERATED; return match; } diff --git a/components/omnibox/keyword_provider.cc b/components/omnibox/keyword_provider.cc index 8677144..d8754e9 100644 --- a/components/omnibox/keyword_provider.cc +++ b/components/omnibox/keyword_provider.cc @@ -403,7 +403,7 @@ AutocompleteMatch KeywordProvider::CreateAutocompleteMatch( FillInURLAndContents(remaining_input, template_url, &match); match.keyword = keyword; - match.transition = content::PAGE_TRANSITION_KEYWORD; + match.transition = ui::PAGE_TRANSITION_KEYWORD; return match; } diff --git a/components/password_manager/content/browser/content_password_manager_driver.cc b/components/password_manager/content/browser/content_password_manager_driver.cc index 35b3820..0c0e348 100644 --- a/components/password_manager/content/browser/content_password_manager_driver.cc +++ b/components/password_manager/content/browser/content_password_manager_driver.cc @@ -14,7 +14,6 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/ssl_status.h" #include "ipc/ipc_message_macros.h" #include "net/cert/cert_status_flags.h" diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc index fde6f24..cda6c46 100644 --- a/components/renderer_context_menu/render_view_context_menu_base.cc +++ b/components/renderer_context_menu/render_view_context_menu_base.cc @@ -362,7 +362,7 @@ RenderFrameHost* RenderViewContextMenuBase::GetRenderFrameHost() { void RenderViewContextMenuBase::OpenURL( const GURL& url, const GURL& referring_url, WindowOpenDisposition disposition, - content::PageTransition transition) { + ui::PageTransition transition) { content::Referrer referrer = content::Referrer::SanitizeForRequest( url, content::Referrer(referring_url.GetAsReferrer(), diff --git a/components/renderer_context_menu/render_view_context_menu_base.h b/components/renderer_context_menu/render_view_context_menu_base.h index db6c175..776a81b 100644 --- a/components/renderer_context_menu/render_view_context_menu_base.h +++ b/components/renderer_context_menu/render_view_context_menu_base.h @@ -15,8 +15,8 @@ #include "components/renderer_context_menu/render_view_context_menu_observer.h" #include "components/renderer_context_menu/render_view_context_menu_proxy.h" #include "content/public/common/context_menu_params.h" -#include "content/public/common/page_transition_types.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" namespace content { @@ -158,7 +158,7 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate, // Opens the specified URL string in a new tab. void OpenURL(const GURL& url, const GURL& referrer, WindowOpenDisposition disposition, - content::PageTransition transition); + ui::PageTransition transition); content::ContextMenuParams params_; content::WebContents* source_web_contents_; diff --git a/components/search_engines/template_url_service_unittest.cc b/components/search_engines/template_url_service_unittest.cc index b3909de..e9937ac 100644 --- a/components/search_engines/template_url_service_unittest.cc +++ b/components/search_engines/template_url_service_unittest.cc @@ -998,7 +998,7 @@ TEST_F(TemplateURLServiceTest, GenerateVisitOnKeyword) { TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("blah")), search_terms_data())), base::Time::Now(), NULL, 0, GURL(), history::RedirectList(), - content::PAGE_TRANSITION_KEYWORD, history::SOURCE_BROWSED, false); + ui::PAGE_TRANSITION_KEYWORD, history::SOURCE_BROWSED, false); // Wait for history to finish processing the request. test_util()->profile()->BlockUntilHistoryProcessesPendingRequests(); @@ -1019,8 +1019,8 @@ TEST_F(TemplateURLServiceTest, GenerateVisitOnKeyword) { EXPECT_TRUE(callback.success); EXPECT_NE(0, callback.row.id()); ASSERT_EQ(1U, callback.visits.size()); - EXPECT_EQ(content::PAGE_TRANSITION_KEYWORD_GENERATED, - content::PageTransitionStripQualifier(callback.visits[0].transition)); + EXPECT_EQ(ui::PAGE_TRANSITION_KEYWORD_GENERATED, + ui::PageTransitionStripQualifier(callback.visits[0].transition)); } // Make sure that the load routine deletes prepopulated engines that no longer diff --git a/components/sessions.gypi b/components/sessions.gypi index 14fa080..2da33d7 100644 --- a/components/sessions.gypi +++ b/components/sessions.gypi @@ -13,6 +13,7 @@ '../content/content.gyp:content_browser', '../skia/skia.gyp:skia', '../third_party/protobuf/protobuf.gyp:protobuf_lite', + '../ui/base/ui_base.gyp:ui_base', '../url/url.gyp:url_lib', ], 'include_dirs': [ diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn index 762bc66..79a0d4b 100644 --- a/components/sessions/BUILD.gn +++ b/components/sessions/BUILD.gn @@ -20,6 +20,7 @@ component("sessions") { "//base", "//content/public/browser", "//skia", + "//ui/base", "//url", ] diff --git a/components/sessions/DEPS b/components/sessions/DEPS index ac27a7d..966369f 100644 --- a/components/sessions/DEPS +++ b/components/sessions/DEPS @@ -3,4 +3,5 @@ include_rules = [ "+content/public/common", "+sync", "+third_party/WebKit/public/platform", + "+ui/base", ] diff --git a/components/sessions/serialized_navigation_entry.cc b/components/sessions/serialized_navigation_entry.cc index a5ba41c..b45ffd7 100644 --- a/components/sessions/serialized_navigation_entry.cc +++ b/components/sessions/serialized_navigation_entry.cc @@ -22,7 +22,7 @@ const char kSearchTermsKey[] = "search_terms"; SerializedNavigationEntry::SerializedNavigationEntry() : index_(-1), unique_id_(0), - transition_type_(content::PAGE_TRANSITION_TYPED), + transition_type_(ui::PAGE_TRANSITION_TYPED), has_post_data_(false), post_id_(-1), is_overriding_user_agent_(false), @@ -80,41 +80,40 @@ SerializedNavigationEntry SerializedNavigationEntry::FromSyncData( if (sync_data.has_page_transition()) { switch (sync_data.page_transition()) { case sync_pb::SyncEnums_PageTransition_LINK: - transition = content::PAGE_TRANSITION_LINK; + transition = ui::PAGE_TRANSITION_LINK; break; case sync_pb::SyncEnums_PageTransition_TYPED: - transition = content::PAGE_TRANSITION_TYPED; + transition = ui::PAGE_TRANSITION_TYPED; break; case sync_pb::SyncEnums_PageTransition_AUTO_BOOKMARK: - transition = content::PAGE_TRANSITION_AUTO_BOOKMARK; + transition = ui::PAGE_TRANSITION_AUTO_BOOKMARK; break; case sync_pb::SyncEnums_PageTransition_AUTO_SUBFRAME: - transition = content::PAGE_TRANSITION_AUTO_SUBFRAME; + transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; break; case sync_pb::SyncEnums_PageTransition_MANUAL_SUBFRAME: - transition = content::PAGE_TRANSITION_MANUAL_SUBFRAME; + transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; break; case sync_pb::SyncEnums_PageTransition_GENERATED: - transition = content::PAGE_TRANSITION_GENERATED; + transition = ui::PAGE_TRANSITION_GENERATED; break; case sync_pb::SyncEnums_PageTransition_AUTO_TOPLEVEL: - transition = content::PAGE_TRANSITION_AUTO_TOPLEVEL; + transition = ui::PAGE_TRANSITION_AUTO_TOPLEVEL; break; case sync_pb::SyncEnums_PageTransition_FORM_SUBMIT: - transition = content::PAGE_TRANSITION_FORM_SUBMIT; + transition = ui::PAGE_TRANSITION_FORM_SUBMIT; break; case sync_pb::SyncEnums_PageTransition_RELOAD: - transition = content::PAGE_TRANSITION_RELOAD; + transition = ui::PAGE_TRANSITION_RELOAD; break; case sync_pb::SyncEnums_PageTransition_KEYWORD: - transition = content::PAGE_TRANSITION_KEYWORD; + transition = ui::PAGE_TRANSITION_KEYWORD; break; case sync_pb::SyncEnums_PageTransition_KEYWORD_GENERATED: - transition = - content::PAGE_TRANSITION_KEYWORD_GENERATED; + transition = ui::PAGE_TRANSITION_KEYWORD_GENERATED; break; default: - transition = content::PAGE_TRANSITION_LINK; + transition = ui::PAGE_TRANSITION_LINK; break; } } @@ -122,26 +121,25 @@ SerializedNavigationEntry SerializedNavigationEntry::FromSyncData( if (sync_data.has_redirect_type()) { switch (sync_data.redirect_type()) { case sync_pb::SyncEnums_PageTransitionRedirectType_CLIENT_REDIRECT: - transition |= content::PAGE_TRANSITION_CLIENT_REDIRECT; + transition |= ui::PAGE_TRANSITION_CLIENT_REDIRECT; break; case sync_pb::SyncEnums_PageTransitionRedirectType_SERVER_REDIRECT: - transition |= content::PAGE_TRANSITION_SERVER_REDIRECT; + transition |= ui::PAGE_TRANSITION_SERVER_REDIRECT; break; } } if (sync_data.navigation_forward_back()) - transition |= content::PAGE_TRANSITION_FORWARD_BACK; + transition |= ui::PAGE_TRANSITION_FORWARD_BACK; if (sync_data.navigation_from_address_bar()) - transition |= content::PAGE_TRANSITION_FROM_ADDRESS_BAR; + transition |= ui::PAGE_TRANSITION_FROM_ADDRESS_BAR; if (sync_data.navigation_home_page()) - transition |= content::PAGE_TRANSITION_HOME_PAGE; + transition |= ui::PAGE_TRANSITION_HOME_PAGE; if (sync_data.navigation_chain_start()) - transition |= content::PAGE_TRANSITION_CHAIN_START; + transition |= ui::PAGE_TRANSITION_CHAIN_START; if (sync_data.navigation_chain_end()) - transition |= content::PAGE_TRANSITION_CHAIN_END; + transition |= ui::PAGE_TRANSITION_CHAIN_END; - navigation.transition_type_ = - static_cast<content::PageTransition>(transition); + navigation.transition_type_ = static_cast<ui::PageTransition>(transition); navigation.timestamp_ = base::Time(); navigation.search_terms_ = base::UTF8ToUTF16(sync_data.search_terms()); @@ -279,7 +277,7 @@ bool SerializedNavigationEntry::ReadFromPickle(PickleIterator* iterator) { return false; virtual_url_ = GURL(virtual_url_spec); page_state_ = content::PageState::CreateFromEncodedData(page_state_data); - transition_type_ = static_cast<content::PageTransition>(transition_type_int); + transition_type_ = ui::PageTransitionFromInt(transition_type_int); // type_mask did not always exist in the written stream. As such, we // don't fail if it can't be read. @@ -344,7 +342,7 @@ scoped_ptr<NavigationEntry> SerializedNavigationEntry::ToNavigationEntry( referrer_, // Use a transition type of reload so that we don't incorrectly // increase the typed count. - content::PAGE_TRANSITION_RELOAD, + ui::PAGE_TRANSITION_RELOAD, false, // The extra headers are not sync'ed across sessions. std::string(), @@ -379,51 +377,51 @@ sync_pb::TabNavigation SerializedNavigationEntry::ToSyncData() const { sync_data.set_title(base::UTF16ToUTF8(title_)); // Page transition core. - COMPILE_ASSERT(content::PAGE_TRANSITION_LAST_CORE == - content::PAGE_TRANSITION_KEYWORD_GENERATED, + COMPILE_ASSERT(ui::PAGE_TRANSITION_LAST_CORE == + ui::PAGE_TRANSITION_KEYWORD_GENERATED, PageTransitionCoreBounds); - switch (PageTransitionStripQualifier(transition_type_)) { - case content::PAGE_TRANSITION_LINK: + switch (ui::PageTransitionStripQualifier(transition_type_)) { + case ui::PAGE_TRANSITION_LINK: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_LINK); break; - case content::PAGE_TRANSITION_TYPED: + case ui::PAGE_TRANSITION_TYPED: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_TYPED); break; - case content::PAGE_TRANSITION_AUTO_BOOKMARK: + case ui::PAGE_TRANSITION_AUTO_BOOKMARK: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_AUTO_BOOKMARK); break; - case content::PAGE_TRANSITION_AUTO_SUBFRAME: + case ui::PAGE_TRANSITION_AUTO_SUBFRAME: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_AUTO_SUBFRAME); break; - case content::PAGE_TRANSITION_MANUAL_SUBFRAME: + case ui::PAGE_TRANSITION_MANUAL_SUBFRAME: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_MANUAL_SUBFRAME); break; - case content::PAGE_TRANSITION_GENERATED: + case ui::PAGE_TRANSITION_GENERATED: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_GENERATED); break; - case content::PAGE_TRANSITION_AUTO_TOPLEVEL: + case ui::PAGE_TRANSITION_AUTO_TOPLEVEL: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_AUTO_TOPLEVEL); break; - case content::PAGE_TRANSITION_FORM_SUBMIT: + case ui::PAGE_TRANSITION_FORM_SUBMIT: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_FORM_SUBMIT); break; - case content::PAGE_TRANSITION_RELOAD: + case ui::PAGE_TRANSITION_RELOAD: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_RELOAD); break; - case content::PAGE_TRANSITION_KEYWORD: + case ui::PAGE_TRANSITION_KEYWORD: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_KEYWORD); break; - case content::PAGE_TRANSITION_KEYWORD_GENERATED: + case ui::PAGE_TRANSITION_KEYWORD_GENERATED: sync_data.set_page_transition( sync_pb::SyncEnums_PageTransition_KEYWORD_GENERATED); break; @@ -432,25 +430,25 @@ sync_pb::TabNavigation SerializedNavigationEntry::ToSyncData() const { } // Page transition qualifiers. - if (PageTransitionIsRedirect(transition_type_)) { - if (transition_type_ & content::PAGE_TRANSITION_CLIENT_REDIRECT) { + if (ui::PageTransitionIsRedirect(transition_type_)) { + if (transition_type_ & ui::PAGE_TRANSITION_CLIENT_REDIRECT) { sync_data.set_redirect_type( sync_pb::SyncEnums_PageTransitionRedirectType_CLIENT_REDIRECT); - } else if (transition_type_ & content::PAGE_TRANSITION_SERVER_REDIRECT) { + } else if (transition_type_ & ui::PAGE_TRANSITION_SERVER_REDIRECT) { sync_data.set_redirect_type( sync_pb::SyncEnums_PageTransitionRedirectType_SERVER_REDIRECT); } } sync_data.set_navigation_forward_back( - (transition_type_ & content::PAGE_TRANSITION_FORWARD_BACK) != 0); + (transition_type_ & ui::PAGE_TRANSITION_FORWARD_BACK) != 0); sync_data.set_navigation_from_address_bar( - (transition_type_ & content::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0); + (transition_type_ & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0); sync_data.set_navigation_home_page( - (transition_type_ & content::PAGE_TRANSITION_HOME_PAGE) != 0); + (transition_type_ & ui::PAGE_TRANSITION_HOME_PAGE) != 0); sync_data.set_navigation_chain_start( - (transition_type_ & content::PAGE_TRANSITION_CHAIN_START) != 0); + (transition_type_ & ui::PAGE_TRANSITION_CHAIN_START) != 0); sync_data.set_navigation_chain_end( - (transition_type_ & content::PAGE_TRANSITION_CHAIN_END) != 0); + (transition_type_ & ui::PAGE_TRANSITION_CHAIN_END) != 0); sync_data.set_unique_id(unique_id_); sync_data.set_timestamp_msec(syncer::TimeToProtoTime(timestamp_)); diff --git a/components/sessions/serialized_navigation_entry.h b/components/sessions/serialized_navigation_entry.h index 0582c7e..6caee55 100644 --- a/components/sessions/serialized_navigation_entry.h +++ b/components/sessions/serialized_navigation_entry.h @@ -15,8 +15,8 @@ #include "base/time/time.h" #include "components/sessions/sessions_export.h" #include "content/public/common/page_state.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" class Pickle; @@ -102,7 +102,7 @@ class SESSIONS_EXPORT SerializedNavigationEntry { const GURL& favicon_url() const { return favicon_url_; } int http_status_code() const { return http_status_code_; } const content::Referrer& referrer() const { return referrer_; } - content::PageTransition transition_type() const { + ui::PageTransition transition_type() const { return transition_type_; } bool has_post_data() const { return has_post_data_; } @@ -147,7 +147,7 @@ class SESSIONS_EXPORT SerializedNavigationEntry { GURL virtual_url_; base::string16 title_; content::PageState page_state_; - content::PageTransition transition_type_; + ui::PageTransition transition_type_; bool has_post_data_; int64 post_id_; GURL original_request_url_; diff --git a/components/sessions/serialized_navigation_entry_test_helper.h b/components/sessions/serialized_navigation_entry_test_helper.h index a653f22..1044b0c 100644 --- a/components/sessions/serialized_navigation_entry_test_helper.h +++ b/components/sessions/serialized_navigation_entry_test_helper.h @@ -8,7 +8,6 @@ #include <string> #include "base/basictypes.h" -#include "content/public/common/page_transition_types.h" class GURL; diff --git a/components/sessions/serialized_navigation_entry_unittest.cc b/components/sessions/serialized_navigation_entry_unittest.cc index 2dcf3ad..25c4a26 100644 --- a/components/sessions/serialized_navigation_entry_unittest.cc +++ b/components/sessions/serialized_navigation_entry_unittest.cc @@ -16,12 +16,12 @@ #include "base/time/time.h" #include "content/public/browser/favicon_status.h" #include "content/public/browser/navigation_entry.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "sync/protocol/session_specifics.pb.h" #include "sync/util/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" namespace sessions { @@ -36,11 +36,11 @@ const GURL kVirtualURL("http://www.virtual-url.com"); const base::string16 kTitle = base::ASCIIToUTF16("title"); const content::PageState kPageState = content::PageState::CreateFromEncodedData("page state"); -const content::PageTransition kTransitionType = - static_cast<content::PageTransition>( - content::PAGE_TRANSITION_AUTO_SUBFRAME | - content::PAGE_TRANSITION_HOME_PAGE | - content::PAGE_TRANSITION_CLIENT_REDIRECT); +const ui::PageTransition kTransitionType = + ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_AUTO_SUBFRAME | + ui::PAGE_TRANSITION_HOME_PAGE | + ui::PAGE_TRANSITION_CLIENT_REDIRECT); const bool kHasPostData = true; const int64 kPostID = 100; const GURL kOriginalRequestURL("http://www.original-request.com"); @@ -113,7 +113,7 @@ TEST(SerializedNavigationEntryTest, DefaultInitializer) { EXPECT_EQ(GURL(), navigation.virtual_url()); EXPECT_TRUE(navigation.title().empty()); EXPECT_FALSE(navigation.page_state().IsValid()); - EXPECT_EQ(content::PAGE_TRANSITION_TYPED, navigation.transition_type()); + EXPECT_EQ(ui::PAGE_TRANSITION_TYPED, navigation.transition_type()); EXPECT_FALSE(navigation.has_post_data()); EXPECT_EQ(-1, navigation.post_id()); EXPECT_EQ(GURL(), navigation.original_request_url()); @@ -239,7 +239,7 @@ TEST(SerializedNavigationEntryTest, ToNavigationEntry) { EXPECT_EQ(kTitle, new_navigation_entry->GetTitle()); EXPECT_EQ(kPageState, new_navigation_entry->GetPageState()); EXPECT_EQ(kPageID, new_navigation_entry->GetPageID()); - EXPECT_EQ(content::PAGE_TRANSITION_RELOAD, + EXPECT_EQ(ui::PAGE_TRANSITION_RELOAD, new_navigation_entry->GetTransitionType()); EXPECT_EQ(kHasPostData, new_navigation_entry->GetHasPostData()); EXPECT_EQ(kPostID, new_navigation_entry->GetPostID()); @@ -323,18 +323,18 @@ TEST(SerializedNavigationEntryTest, LastNavigationRedirectUrl) { TEST(SerializedNavigationEntryTest, TransitionTypes) { scoped_ptr<content::NavigationEntry> navigation_entry( MakeNavigationEntryForTest()); - for (uint32 core_type = content::PAGE_TRANSITION_LINK; - core_type != content::PAGE_TRANSITION_LAST_CORE; ++core_type) { + for (uint32 core_type = ui::PAGE_TRANSITION_LINK; + core_type != ui::PAGE_TRANSITION_LAST_CORE; ++core_type) { // Because qualifier is a uint32, left shifting will eventually overflow // and hit zero again. SERVER_REDIRECT, as the last qualifier and also // in place of the sign bit, is therefore the last transition before // breaking. - for (uint32 qualifier = content::PAGE_TRANSITION_FORWARD_BACK; + for (uint32 qualifier = ui::PAGE_TRANSITION_FORWARD_BACK; qualifier != 0; qualifier <<= 1) { if (qualifier == 0x08000000) continue; // 0x08000000 is not a valid qualifier. - content::PageTransition transition = - static_cast<content::PageTransition>(core_type | qualifier); + ui::PageTransition transition = + ui::PageTransitionFromInt(core_type | qualifier); navigation_entry->SetTransitionType(transition); const SerializedNavigationEntry& navigation = @@ -343,7 +343,7 @@ TEST(SerializedNavigationEntryTest, TransitionTypes) { const sync_pb::TabNavigation& sync_data = navigation.ToSyncData(); const SerializedNavigationEntry& constructed_nav = SerializedNavigationEntry::FromSyncData(kIndex, sync_data); - const content::PageTransition constructed_transition = + const ui::PageTransition constructed_transition = constructed_nav.transition_type(); EXPECT_EQ(transition, constructed_transition); diff --git a/components/translate/content/browser/content_translate_driver.cc b/components/translate/content/browser/content_translate_driver.cc index ffdd17d..ab86100 100644 --- a/components/translate/content/browser/content_translate_driver.cc +++ b/components/translate/content/browser/content_translate_driver.cc @@ -80,7 +80,7 @@ void ContentTranslateDriver::InitiateTranslation(const std::string& page_lang, bool ContentTranslateDriver::IsLinkNavigation() { return navigation_controller_ && navigation_controller_->GetActiveEntry() && navigation_controller_->GetActiveEntry()->GetTransitionType() == - content::PAGE_TRANSITION_LINK; + ui::PAGE_TRANSITION_LINK; } void ContentTranslateDriver::OnTranslateEnabledChanged() { @@ -149,7 +149,7 @@ void ContentTranslateDriver::OpenUrlInNewTab(const GURL& url) { content::OpenURLParams params(url, content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false); navigation_controller_->GetWebContents()->OpenURL(params); } @@ -185,7 +185,7 @@ void ContentTranslateDriver::NavigationEntryCommitted( } // If not a reload, return. - if (entry->GetTransitionType() != content::PAGE_TRANSITION_RELOAD && + if (entry->GetTransitionType() != ui::PAGE_TRANSITION_RELOAD && load_details.type != content::NAVIGATION_TYPE_SAME_PAGE) { return; } @@ -210,7 +210,7 @@ void ContentTranslateDriver::DidNavigateAnyFrame( const content::FrameNavigateParams& params) { // Let the LanguageState clear its state. const bool reload = - details.entry->GetTransitionType() == content::PAGE_TRANSITION_RELOAD || + details.entry->GetTransitionType() == ui::PAGE_TRANSITION_RELOAD || details.type == content::NAVIGATION_TYPE_SAME_PAGE; translate_manager_->GetLanguageState().DidNavigate( details.is_in_page, details.is_main_frame, reload); diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc index 9e6e15e..485ac50 100644 --- a/components/web_contents_delegate_android/web_contents_delegate_android.cc +++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc @@ -20,7 +20,6 @@ #include "content/public/browser/page_navigator.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "jni/WebContentsDelegateAndroid_jni.h" #include "ui/base/window_open_disposition.h" diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 3afa104..c473c09 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -48,7 +48,6 @@ #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "content/public/common/menu_item.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/user_agent.h" #include "jni/ContentViewCore_jni.h" #include "third_party/WebKit/public/web/WebInputEvent.h" diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc index 708e7bf..237abd6 100644 --- a/content/browser/android/web_contents_observer_android.cc +++ b/content/browser/android/web_contents_observer_android.cc @@ -164,8 +164,8 @@ void WebContentsObserverAndroid::DidNavigateAnyFrame( ConvertUTF8ToJavaString(env, params.url.spec())); ScopedJavaLocalRef<jstring> jstring_base_url( ConvertUTF8ToJavaString(env, params.base_url.spec())); - jboolean jboolean_is_reload = - PageTransitionCoreTypeIs(params.transition, PAGE_TRANSITION_RELOAD); + jboolean jboolean_is_reload = ui::PageTransitionCoreTypeIs( + params.transition, ui::PAGE_TRANSITION_RELOAD); Java_WebContentsObserverAndroid_didNavigateAnyFrame( env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(), @@ -201,7 +201,7 @@ void WebContentsObserverAndroid::DidStartProvisionalLoadForFrame( void WebContentsObserverAndroid::DidCommitProvisionalLoadForFrame( RenderFrameHost* render_frame_host, const GURL& url, - PageTransition transition_type) { + ui::PageTransition transition_type) { JNIEnv* env = AttachCurrentThread(); ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); if (obj.is_null()) diff --git a/content/browser/android/web_contents_observer_android.h b/content/browser/android/web_contents_observer_android.h index 8834a3d..db5ed62 100644 --- a/content/browser/android/web_contents_observer_android.h +++ b/content/browser/android/web_contents_observer_android.h @@ -58,7 +58,7 @@ class WebContentsObserverAndroid : public WebContentsObserver { virtual void DidCommitProvisionalLoadForFrame( RenderFrameHost* render_frame_host, const GURL& url, - PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; virtual void DidFinishLoad(RenderFrameHost* render_frame_host, const GURL& validated_url) OVERRIDE; virtual void DocumentLoadedInFrame( diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 9fd8e8d..992bccc 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -430,7 +430,7 @@ void BrowserPluginGuest::SendQueuedMessages() { void BrowserPluginGuest::DidCommitProvisionalLoadForFrame( RenderFrameHost* render_frame_host, const GURL& url, - PageTransition transition_type) { + ui::PageTransition transition_type) { RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.DidNavigate")); } diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h index 805af4a..13aed33 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.h +++ b/content/browser/browser_plugin/browser_plugin_guest.h @@ -154,7 +154,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver { virtual void DidCommitProvisionalLoadForFrame( RenderFrameHost* render_frame_host, const GURL& url, - PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; virtual void RenderViewReady() OVERRIDE; virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc index 8ef8cad..1da4418 100644 --- a/content/browser/devtools/devtools_manager_unittest.cc +++ b/content/browser/devtools/devtools_manager_unittest.cc @@ -160,9 +160,9 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) { // Navigate to URL. First URL should use first RenderViewHost. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); contents()->TestDidNavigate( - contents()->GetMainFrame(), 1, url, PAGE_TRANSITION_TYPED); + contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); TestDevToolsClientHost client_host; @@ -172,16 +172,16 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) { // Navigate to new site which should get a new RenderViewHost. const GURL url2("http://www.yahoo.com"); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(contents()->cross_navigation_pending()); EXPECT_EQ(client_host.agent_host(), DevToolsAgentHost::GetOrCreateFor(web_contents()).get()); // Interrupt pending navigation and navigate back to the original site. controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); contents()->TestDidNavigate( - contents()->GetMainFrame(), 1, url, PAGE_TRANSITION_TYPED); + contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(client_host.agent_host(), DevToolsAgentHost::GetOrCreateFor(web_contents()).get()); diff --git a/content/browser/devtools/renderer_overrides_handler.cc b/content/browser/devtools/renderer_overrides_handler.cc index 6cc5a3d..8ef5323 100644 --- a/content/browser/devtools/renderer_overrides_handler.cc +++ b/content/browser/devtools/renderer_overrides_handler.cc @@ -38,7 +38,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/content_client.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "content/public/common/url_constants.h" #include "ipc/ipc_sender.h" @@ -48,6 +47,7 @@ #include "third_party/WebKit/public/platform/WebScreenInfo.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/skia/include/core/SkCanvas.h" +#include "ui/base/page_transition_types.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/display.h" @@ -429,7 +429,7 @@ RendererOverridesHandler::PageNavigate( WebContents* web_contents = WebContents::FromRenderViewHost(host_); if (web_contents) { web_contents->GetController() - .LoadURL(gurl, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + .LoadURL(gurl, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Fall through into the renderer. return NULL; } diff --git a/content/browser/download/download_create_info.cc b/content/browser/download/download_create_info.cc index e381fa8..05b0992 100644 --- a/content/browser/download/download_create_info.cc +++ b/content/browser/download/download_create_info.cc @@ -15,7 +15,7 @@ DownloadCreateInfo::DownloadCreateInfo(const base::Time& start_time, int64 total_bytes, const net::BoundNetLog& bound_net_log, bool has_user_gesture, - PageTransition transition_type, + ui::PageTransition transition_type, scoped_ptr<DownloadSaveInfo> save_info) : start_time(start_time), total_bytes(total_bytes), @@ -29,7 +29,7 @@ DownloadCreateInfo::DownloadCreateInfo() : total_bytes(0), download_id(DownloadItem::kInvalidId), has_user_gesture(false), - transition_type(PAGE_TRANSITION_LINK), + transition_type(ui::PAGE_TRANSITION_LINK), save_info(new DownloadSaveInfo()) { } diff --git a/content/browser/download/download_create_info.h b/content/browser/download/download_create_info.h index e8e1443b9..cbf8711 100644 --- a/content/browser/download/download_create_info.h +++ b/content/browser/download/download_create_info.h @@ -15,8 +15,8 @@ #include "content/browser/download/download_request_handle.h" #include "content/common/content_export.h" #include "content/public/browser/download_save_info.h" -#include "content/public/common/page_transition_types.h" #include "net/base/net_log.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" namespace content { @@ -28,7 +28,7 @@ struct CONTENT_EXPORT DownloadCreateInfo { int64 total_bytes, const net::BoundNetLog& bound_net_log, bool has_user_gesture, - PageTransition transition_type, + ui::PageTransition transition_type, scoped_ptr<DownloadSaveInfo> save_info); DownloadCreateInfo(); ~DownloadCreateInfo(); @@ -63,7 +63,7 @@ struct CONTENT_EXPORT DownloadCreateInfo { // True if the download was initiated by user action. bool has_user_gesture; - PageTransition transition_type; + ui::PageTransition transition_type; // The content-disposition string from the response header. std::string content_disposition; diff --git a/content/browser/download/download_item_impl.cc b/content/browser/download/download_item_impl.cc index 1eccc2b..f681486 100644 --- a/content/browser/download/download_item_impl.cc +++ b/content/browser/download/download_item_impl.cc @@ -133,7 +133,7 @@ DownloadItemImpl::DownloadItemImpl(DownloadItemImplDelegate* delegate, target_disposition_(TARGET_DISPOSITION_OVERWRITE), url_chain_(url_chain), referrer_url_(referrer_url), - transition_type_(PAGE_TRANSITION_LINK), + transition_type_(ui::PAGE_TRANSITION_LINK), has_user_gesture_(false), mime_type_(mime_type), original_mime_type_(original_mime_type), @@ -242,7 +242,7 @@ DownloadItemImpl::DownloadItemImpl( target_disposition_(TARGET_DISPOSITION_OVERWRITE), url_chain_(1, url), referrer_url_(GURL()), - transition_type_(PAGE_TRANSITION_LINK), + transition_type_(ui::PAGE_TRANSITION_LINK), has_user_gesture_(false), mime_type_(mime_type), original_mime_type_(mime_type), @@ -588,7 +588,7 @@ bool DownloadItemImpl::HasUserGesture() const { return has_user_gesture_; }; -PageTransition DownloadItemImpl::GetTransitionType() const { +ui::PageTransition DownloadItemImpl::GetTransitionType() const { return transition_type_; }; diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h index 34916ff..5408f11 100644 --- a/content/browser/download/download_item_impl.h +++ b/content/browser/download/download_item_impl.h @@ -121,7 +121,7 @@ class CONTENT_EXPORT DownloadItemImpl virtual std::string GetOriginalMimeType() const OVERRIDE; virtual std::string GetRemoteAddress() const OVERRIDE; virtual bool HasUserGesture() const OVERRIDE; - virtual PageTransition GetTransitionType() const OVERRIDE; + virtual ui::PageTransition GetTransitionType() const OVERRIDE; virtual const std::string& GetLastModifiedTime() const OVERRIDE; virtual const std::string& GetETag() const OVERRIDE; virtual bool IsSavePackageDownload() const OVERRIDE; @@ -437,7 +437,7 @@ class CONTENT_EXPORT DownloadItemImpl base::FilePath forced_file_path_; // Page transition that triggerred the download. - PageTransition transition_type_; + ui::PageTransition transition_type_; // Whether the download was triggered with a user gesture. bool has_user_gesture_; diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc index 8c7ed9f..eb7a605 100644 --- a/content/browser/download/download_manager_impl_unittest.cc +++ b/content/browser/download/download_manager_impl_unittest.cc @@ -159,7 +159,7 @@ class MockDownloadItemImpl : public DownloadItemImpl { MOCK_METHOD0(GetAutoOpened, bool()); MOCK_CONST_METHOD0(GetForcedFilePath, const base::FilePath&()); MOCK_CONST_METHOD0(HasUserGesture, bool()); - MOCK_CONST_METHOD0(GetTransitionType, PageTransition()); + MOCK_CONST_METHOD0(GetTransitionType, ui::PageTransition()); MOCK_CONST_METHOD0(IsTemporary, bool()); MOCK_METHOD1(SetIsTemporary, void(bool)); MOCK_METHOD1(SetOpened, void(bool)); diff --git a/content/browser/frame_host/debug_urls.cc b/content/browser/frame_host/debug_urls.cc index 6ecb5d7..6bfc3cc 100644 --- a/content/browser/frame_host/debug_urls.cc +++ b/content/browser/frame_host/debug_urls.cc @@ -110,15 +110,15 @@ bool HandleAsanDebugURL(const GURL& url) { } // namespace -bool HandleDebugURL(const GURL& url, PageTransition transition) { +bool HandleDebugURL(const GURL& url, ui::PageTransition transition) { // Ensure that the user explicitly navigated to this URL, unless // kEnableGpuBenchmarking is enabled by Telemetry. bool is_telemetry_navigation = base::CommandLine::ForCurrentProcess()->HasSwitch( cc::switches::kEnableGpuBenchmarking) && - (transition & PAGE_TRANSITION_TYPED); + (transition & ui::PAGE_TRANSITION_TYPED); - if (!(transition & PAGE_TRANSITION_FROM_ADDRESS_BAR) && + if (!(transition & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) && !is_telemetry_navigation) return false; diff --git a/content/browser/frame_host/debug_urls.h b/content/browser/frame_host/debug_urls.h index 01530b4..413cd0f 100644 --- a/content/browser/frame_host/debug_urls.h +++ b/content/browser/frame_host/debug_urls.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_FRAME_HOST_DEBUG_URLS_H_ #define CONTENT_BROWSER_FRAME_HOST_DEBUG_URLS_H_ -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" class GURL; @@ -13,7 +13,7 @@ namespace content { // Checks if the given url is a url used for debugging purposes, and if so // handles it and returns true. -bool HandleDebugURL(const GURL& url, PageTransition transition); +bool HandleDebugURL(const GURL& url, ui::PageTransition transition); // Returns whether the given url is either a debugging url handled in the // renderer process, such as one that crashes or hangs the renderer, or a diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc index f2ce0ea..6bd9590 100644 --- a/content/browser/frame_host/interstitial_page_impl.cc +++ b/content/browser/frame_host/interstitial_page_impl.cc @@ -40,9 +40,9 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/bindings_policy.h" -#include "content/public/common/page_transition_types.h" #include "net/base/escape.h" #include "net/url_request/url_request_context_getter.h" +#include "ui/base/page_transition_types.h" using blink::WebDragOperation; using blink::WebDragOperationsMask; @@ -470,8 +470,8 @@ void InterstitialPageImpl::DidNavigate( DontProceed(); return; } - if (PageTransitionCoreTypeIs(params.transition, - PAGE_TRANSITION_AUTO_SUBFRAME)) { + if (ui::PageTransitionCoreTypeIs(params.transition, + ui::PAGE_TRANSITION_AUTO_SUBFRAME)) { // No need to handle navigate message from iframe in the interstitial page. return; } diff --git a/content/browser/frame_host/navigation_before_commit_info.h b/content/browser/frame_host/navigation_before_commit_info.h index 68a047a..2a90b1d 100644 --- a/content/browser/frame_host/navigation_before_commit_info.h +++ b/content/browser/frame_host/navigation_before_commit_info.h @@ -10,7 +10,6 @@ #include "base/basictypes.h" #include "base/time/time.h" #include "content/common/content_export.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "url/gurl.h" diff --git a/content/browser/frame_host/navigation_controller_android.cc b/content/browser/frame_host/navigation_controller_android.cc index 4f3f45a..ff7b6ab 100644 --- a/content/browser/frame_host/navigation_controller_android.cc +++ b/content/browser/frame_host/navigation_controller_android.cc @@ -167,7 +167,7 @@ void NavigationControllerAndroid::LoadUrl(JNIEnv* env, params.load_type = static_cast<NavigationController::LoadURLType>(load_url_type); - params.transition_type = PageTransitionFromInt(transition_type); + params.transition_type = ui::PageTransitionFromInt(transition_type); params.override_user_agent = static_cast<NavigationController::UserAgentOverrideOption>( ua_override_option); diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc index c4f05fd..3b53e58 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -95,7 +95,7 @@ void ConfigureEntriesForRestore( for (size_t i = 0; i < entries->size(); ++i) { // Use a transition type of reload so that we don't incorrectly increase // the typed count. - (*entries)[i]->SetTransitionType(PAGE_TRANSITION_RELOAD); + (*entries)[i]->SetTransitionType(ui::PAGE_TRANSITION_RELOAD); (*entries)[i]->set_restore_type(ControllerRestoreTypeToEntryType(type)); // NOTE(darin): This code is only needed for backwards compat. SetPageStateIfEmpty((*entries)[i].get()); @@ -159,7 +159,7 @@ static bool g_check_for_repost = true; NavigationEntry* NavigationController::CreateNavigationEntry( const GURL& url, const Referrer& referrer, - PageTransition transition, + ui::PageTransition transition, bool is_renderer_initiated, const std::string& extra_headers, BrowserContext* browser_context) { @@ -288,7 +288,7 @@ void NavigationControllerImpl::ReloadInternal(bool check_for_repost, return; LoadURL(transient_entry->GetURL(), Referrer(), - PAGE_TRANSITION_RELOAD, + ui::PAGE_TRANSITION_RELOAD, transient_entry->extra_headers()); return; } @@ -376,7 +376,7 @@ void NavigationControllerImpl::ReloadInternal(bool check_for_repost, // See Chromium issue 96041. pending_entry_->SetTitle(base::string16()); - pending_entry_->SetTransitionType(PAGE_TRANSITION_RELOAD); + pending_entry_->SetTransitionType(ui::PAGE_TRANSITION_RELOAD); } NavigateToPendingEntry(reload_type); @@ -552,9 +552,9 @@ void NavigationControllerImpl::GoBack() { pending_entry_index_ = current_index - 1; entries_[pending_entry_index_]->SetTransitionType( - PageTransitionFromInt( + ui::PageTransitionFromInt( entries_[pending_entry_index_]->GetTransitionType() | - PAGE_TRANSITION_FORWARD_BACK)); + ui::PAGE_TRANSITION_FORWARD_BACK)); NavigateToPendingEntry(NO_RELOAD); } @@ -578,9 +578,9 @@ void NavigationControllerImpl::GoForward() { pending_entry_index_++; entries_[pending_entry_index_]->SetTransitionType( - PageTransitionFromInt( + ui::PageTransitionFromInt( entries_[pending_entry_index_]->GetTransitionType() | - PAGE_TRANSITION_FORWARD_BACK)); + ui::PAGE_TRANSITION_FORWARD_BACK)); NavigateToPendingEntry(NO_RELOAD); } @@ -605,9 +605,9 @@ void NavigationControllerImpl::GoToIndex(int index) { pending_entry_index_ = index; entries_[pending_entry_index_]->SetTransitionType( - PageTransitionFromInt( + ui::PageTransitionFromInt( entries_[pending_entry_index_]->GetTransitionType() | - PAGE_TRANSITION_FORWARD_BACK)); + ui::PAGE_TRANSITION_FORWARD_BACK)); NavigateToPendingEntry(NO_RELOAD); } @@ -639,7 +639,7 @@ void NavigationControllerImpl::UpdateVirtualURLToURL( void NavigationControllerImpl::LoadURL( const GURL& url, const Referrer& referrer, - PageTransition transition, + ui::PageTransition transition, const std::string& extra_headers) { LoadURLParams params(url); params.referrer = referrer; @@ -860,7 +860,7 @@ bool NavigationControllerImpl::RendererDidNavigate( // The active entry's SiteInstance should match our SiteInstance. // TODO(creis): This check won't pass for subframes until we create entries // for subframe navigations. - if (PageTransitionIsMainFrame(params.transition)) + if (ui::PageTransitionIsMainFrame(params.transition)) CHECK(active_entry->site_instance() == rfh->GetSiteInstance()); // Remember the bindings the renderer process has at this point, so that @@ -871,7 +871,7 @@ bool NavigationControllerImpl::RendererDidNavigate( // Now prep the rest of the details for the notification and broadcast. details->entry = active_entry; details->is_main_frame = - PageTransitionIsMainFrame(params.transition); + ui::PageTransitionIsMainFrame(params.transition); details->serialized_security_info = params.security_info; details->http_status_code = params.http_status_code; NotifyNavigationEntryCommitted(details); @@ -918,7 +918,7 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( // Greater page IDs than we've ever seen before are new pages. We may or may // not have a pending entry for the page, and this may or may not be the // main frame. - if (PageTransitionIsMainFrame(params.transition)) + if (ui::PageTransitionIsMainFrame(params.transition)) return NAVIGATION_TYPE_NEW_PAGE; // When this is a new subframe navigation, we should have a committed page @@ -983,7 +983,7 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( } NavigationEntryImpl* existing_entry = entries_[existing_entry_index].get(); - if (!PageTransitionIsMainFrame(params.transition)) { + if (!ui::PageTransitionIsMainFrame(params.transition)) { // All manual subframes would get new IDs and were handled above, so we // know this is auto. Since the current page was found in the navigation // entry list, we're guaranteed to have a last committed entry. @@ -1098,7 +1098,7 @@ void NavigationControllerImpl::RendererDidNavigateToExistingPage( RenderFrameHost* rfh, const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { // We should only get here for main frame navigations. - DCHECK(PageTransitionIsMainFrame(params.transition)); + DCHECK(ui::PageTransitionIsMainFrame(params.transition)); // This is a back/forward navigation. The existing page for the ID is // guaranteed to exist by ClassifyNavigation, and we just need to update it @@ -1117,7 +1117,7 @@ void NavigationControllerImpl::RendererDidNavigateToExistingPage( // The redirected to page should not inherit the favicon from the previous // page. - if (PageTransitionIsRedirect(params.transition)) + if (ui::PageTransitionIsRedirect(params.transition)) entry->GetFavicon() = FaviconStatus(); // The site instance will normally be the same except during session restore, @@ -1178,7 +1178,7 @@ void NavigationControllerImpl::RendererDidNavigateInPage( RenderFrameHost* rfh, const FrameHostMsg_DidCommitProvisionalLoad_Params& params, bool* did_replace_entry) { - DCHECK(PageTransitionIsMainFrame(params.transition)) << + DCHECK(ui::PageTransitionIsMainFrame(params.transition)) << "WebKit should only tell us about in-page navs for the main frame."; // We're guaranteed to have an entry for this one. NavigationEntryImpl* existing_entry = GetEntryWithPageID( @@ -1209,8 +1209,8 @@ void NavigationControllerImpl::RendererDidNavigateInPage( void NavigationControllerImpl::RendererDidNavigateNewSubframe( RenderFrameHost* rfh, const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { - if (PageTransitionCoreTypeIs(params.transition, - PAGE_TRANSITION_AUTO_SUBFRAME)) { + if (ui::PageTransitionCoreTypeIs(params.transition, + ui::PAGE_TRANSITION_AUTO_SUBFRAME)) { // This is not user-initiated. Ignore. DiscardNonCommittedEntriesInternal(); return; @@ -1541,7 +1541,7 @@ int NavigationControllerImpl::GetPendingEntryIndex() const { void NavigationControllerImpl::InsertOrReplaceEntry(NavigationEntryImpl* entry, bool replace) { - DCHECK(entry->GetTransitionType() != PAGE_TRANSITION_AUTO_SUBFRAME); + DCHECK(entry->GetTransitionType() != ui::PAGE_TRANSITION_AUTO_SUBFRAME); // Copy the pending entry's unique ID to the committed entry. // I don't know if pending_entry_index_ can be other than -1 here. @@ -1606,7 +1606,7 @@ void NavigationControllerImpl::NavigateToPendingEntry(ReloadType reload_type) { (entries_[pending_entry_index_]->restore_type() == NavigationEntryImpl::RESTORE_NONE) && (entries_[pending_entry_index_]->GetTransitionType() & - PAGE_TRANSITION_FORWARD_BACK)) { + ui::PAGE_TRANSITION_FORWARD_BACK)) { delegate_->Stop(); // If an interstitial page is showing, we want to close it to get back diff --git a/content/browser/frame_host/navigation_controller_impl.h b/content/browser/frame_host/navigation_controller_impl.h index 82fac02..3deb5ba 100644 --- a/content/browser/frame_host/navigation_controller_impl.h +++ b/content/browser/frame_host/navigation_controller_impl.h @@ -58,7 +58,7 @@ class CONTENT_EXPORT NavigationControllerImpl virtual void SetTransientEntry(NavigationEntry* entry) OVERRIDE; virtual void LoadURL(const GURL& url, const Referrer& referrer, - PageTransition type, + ui::PageTransition type, const std::string& extra_headers) OVERRIDE; virtual void LoadURLWithParams(const LoadURLParams& params) OVERRIDE; virtual void LoadIfNecessary() OVERRIDE; diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc index b58343b..f3aea72 100644 --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc @@ -354,7 +354,8 @@ TEST_F(NavigationControllerTest, LoadURL) { const GURL url1("http://foo1"); const GURL url2("http://foo2"); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Creating a pending notification should not have issued any of the // notifications we're listening for. EXPECT_EQ(0U, notifications.size()); @@ -398,7 +399,8 @@ TEST_F(NavigationControllerTest, LoadURL) { EXPECT_FALSE(controller.GetVisibleEntry()->GetTimestamp().is_null()); // Load another... - controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // The load should now be pending. EXPECT_EQ(controller.GetEntryCount(), 1); @@ -455,14 +457,16 @@ TEST_F(NavigationControllerTest, LoadURLSameTime) { const GURL url1("http://foo1"); const GURL url2("http://foo2"); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, url1); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; // Load another... - controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate the beforeunload ack for the cross-site transition, and then the // commit. @@ -514,7 +518,7 @@ TEST_F(NavigationControllerTest, LoadURLWithParams) { NavigationController::LoadURLParams load_params(GURL("http://foo")); load_params.referrer = Referrer(GURL("http://referrer"), blink::WebReferrerPolicyDefault); - load_params.transition_type = PAGE_TRANSITION_GENERATED; + load_params.transition_type = ui::PAGE_TRANSITION_GENERATED; load_params.extra_headers = "content-type: text/plain"; load_params.load_type = NavigationController::LOAD_TYPE_DEFAULT; load_params.is_renderer_initiated = true; @@ -555,7 +559,7 @@ TEST_F(NavigationControllerTest, LoadURLWithExtraParams_HttpPost) { NavigationControllerImpl& controller = controller_impl(); NavigationController::LoadURLParams load_params(GURL("https://posturl")); - load_params.transition_type = PAGE_TRANSITION_TYPED; + load_params.transition_type = ui::PAGE_TRANSITION_TYPED; load_params.load_type = NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST; load_params.override_user_agent = NavigationController::UA_OVERRIDE_TRUE; @@ -588,7 +592,8 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage) { const GURL url1("http://foo1"); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(0U, notifications.size()); main_test_rfh()->SendNavigate(0, url1); EXPECT_EQ(1U, navigation_entry_committed_counter_); @@ -598,7 +603,8 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage) { const base::Time timestamp = controller.GetVisibleEntry()->GetTimestamp(); EXPECT_FALSE(timestamp.is_null()); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(0U, notifications.size()); main_test_rfh()->SendNavigate(0, url1); EXPECT_EQ(1U, navigation_entry_committed_counter_); @@ -630,11 +636,12 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage_DifferentMethod) { const GURL url1("http://foo1"); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 0; params.url = url1; - params.transition = PAGE_TRANSITION_TYPED; + params.transition = ui::PAGE_TRANSITION_TYPED; params.is_post = true; params.post_id = 123; params.page_state = PageState::CreateForTesting(url1, false, 0, 0); @@ -646,7 +653,8 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage_DifferentMethod) { EXPECT_TRUE(entry->GetHasPostData()); EXPECT_EQ(entry->GetPostID(), 123); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, url1); // We should not have produced a new session history entry. @@ -666,7 +674,8 @@ TEST_F(NavigationControllerTest, LoadURL_Discarded) { const GURL url1("http://foo1"); const GURL url2("http://foo2"); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(0U, notifications.size()); main_test_rfh()->SendNavigate(0, url1); EXPECT_EQ(1U, navigation_entry_committed_counter_); @@ -676,7 +685,8 @@ TEST_F(NavigationControllerTest, LoadURL_Discarded) { const base::Time timestamp = controller.GetVisibleEntry()->GetTimestamp(); EXPECT_FALSE(timestamp.is_null()); - controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); controller.DiscardNonCommittedEntries(); EXPECT_EQ(0U, notifications.size()); @@ -704,7 +714,7 @@ TEST_F(NavigationControllerTest, LoadURL_NoPending) { // First make an existing committed entry. const GURL kExistingURL1("http://eh"); controller.LoadURL( - kExistingURL1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kExistingURL1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, kExistingURL1); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; @@ -734,7 +744,7 @@ TEST_F(NavigationControllerTest, LoadURL_NewPending) { // First make an existing committed entry. const GURL kExistingURL1("http://eh"); controller.LoadURL( - kExistingURL1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kExistingURL1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, kExistingURL1); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; @@ -742,7 +752,7 @@ TEST_F(NavigationControllerTest, LoadURL_NewPending) { // Make a pending entry to somewhere new. const GURL kExistingURL2("http://bee"); controller.LoadURL( - kExistingURL2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kExistingURL2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(0U, notifications.size()); // After the beforeunload but before it commits, do a new navigation. @@ -770,14 +780,14 @@ TEST_F(NavigationControllerTest, LoadURL_ExistingPending) { // First make some history. const GURL kExistingURL1("http://foo/eh"); controller.LoadURL( - kExistingURL1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kExistingURL1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, kExistingURL1); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; const GURL kExistingURL2("http://foo/bee"); controller.LoadURL( - kExistingURL2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kExistingURL2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(1, kExistingURL2); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; @@ -814,7 +824,7 @@ TEST_F(NavigationControllerTest, LoadURL_PrivilegedPending) { // First make some history, starting with a privileged URL. const GURL kExistingURL1("http://privileged"); controller.LoadURL( - kExistingURL1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kExistingURL1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Pretend it has bindings so we can tell if we incorrectly copy it. test_rvh()->AllowBindings(2); main_test_rfh()->SendNavigate(0, kExistingURL1); @@ -824,7 +834,7 @@ TEST_F(NavigationControllerTest, LoadURL_PrivilegedPending) { // Navigate cross-process to a second URL. const GURL kExistingURL2("http://foo/eh"); controller.LoadURL( - kExistingURL2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kExistingURL2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); test_rvh()->SendBeforeUnloadACK(true); TestRenderFrameHost* foo_rfh = contents()->GetPendingMainFrame(); foo_rfh->SendNavigate(1, kExistingURL2); @@ -868,14 +878,14 @@ TEST_F(NavigationControllerTest, LoadURL_BackPreemptsPending) { // First make some history. const GURL kExistingURL1("http://foo/eh"); controller.LoadURL( - kExistingURL1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kExistingURL1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, kExistingURL1); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; const GURL kExistingURL2("http://foo/bee"); controller.LoadURL( - kExistingURL2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kExistingURL2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(1, kExistingURL2); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; @@ -883,7 +893,7 @@ TEST_F(NavigationControllerTest, LoadURL_BackPreemptsPending) { // Now make a pending new navigation. const GURL kNewURL("http://foo/see"); controller.LoadURL( - kNewURL, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kNewURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(0U, notifications.size()); EXPECT_EQ(-1, controller.GetPendingEntryIndex()); EXPECT_EQ(1, controller.GetLastCommittedEntryIndex()); @@ -919,7 +929,7 @@ TEST_F(NavigationControllerTest, LoadURL_IgnorePreemptsPending) { // Now make a pending new navigation. const GURL kNewURL("http://eh"); controller.LoadURL( - kNewURL, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kNewURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(0U, notifications.size()); EXPECT_EQ(-1, controller.GetPendingEntryIndex()); EXPECT_TRUE(controller.GetPendingEntry()); @@ -956,7 +966,7 @@ TEST_F(NavigationControllerTest, LoadURL_AbortDoesntCancelPending) { // Start with a pending new navigation. const GURL kNewURL("http://eh"); controller.LoadURL( - kNewURL, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kNewURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(0U, notifications.size()); EXPECT_EQ(-1, controller.GetPendingEntryIndex()); EXPECT_TRUE(controller.GetPendingEntry()); @@ -1002,7 +1012,7 @@ TEST_F(NavigationControllerTest, LoadURL_RedirectAbortDoesntShowPendingURL) { // First make an existing committed entry. const GURL kExistingURL("http://foo/eh"); controller.LoadURL(kExistingURL, content::Referrer(), - content::PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(1, kExistingURL); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; @@ -1015,7 +1025,7 @@ TEST_F(NavigationControllerTest, LoadURL_RedirectAbortDoesntShowPendingURL) { // Now make a pending new navigation, initiated by the renderer. const GURL kNewURL("http://foo/bee"); NavigationController::LoadURLParams load_url_params(kNewURL); - load_url_params.transition_type = PAGE_TRANSITION_TYPED; + load_url_params.transition_type = ui::PAGE_TRANSITION_TYPED; load_url_params.is_renderer_initiated = true; controller.LoadURLWithParams(load_url_params); EXPECT_EQ(0U, notifications.size()); @@ -1076,7 +1086,8 @@ TEST_F(NavigationControllerTest, LoadURL_WithBindings) { const GURL url2("http://foo2"); // Navigate to a first, unprivileged URL. - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(NavigationEntryImpl::kInvalidBindings, NavigationEntryImpl::FromNavigationEntry( controller.GetPendingEntry())->bindings()); @@ -1099,7 +1110,8 @@ TEST_F(NavigationControllerTest, LoadURL_WithBindings) { // Navigate to a second URL, simulate the beforeunload ack for the cross-site // transition, and set bindings on the pending RenderViewHost to simulate a // privileged url. - controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); orig_rfh->GetRenderViewHost()->SendBeforeUnloadACK(true); TestRenderFrameHost* new_rfh = contents()->GetPendingMainFrame(); new_rfh->GetRenderViewHost()->AllowBindings(1); @@ -1128,7 +1140,8 @@ TEST_F(NavigationControllerTest, Reload) { const GURL url1("http://foo1"); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(0U, notifications.size()); main_test_rfh()->SendNavigate(0, url1); EXPECT_EQ(1U, navigation_entry_committed_counter_); @@ -1181,7 +1194,8 @@ TEST_F(NavigationControllerTest, Reload_GeneratesNewPage) { const GURL url1("http://foo1"); const GURL url2("http://foo2"); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, url1); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; @@ -1210,7 +1224,8 @@ TEST_F(NavigationControllerTest, ReloadWithGuest) { NavigationControllerImpl& controller = controller_impl(); const GURL url1("http://foo1"); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, url1); ASSERT_TRUE(controller.GetVisibleEntry()); @@ -1245,7 +1260,7 @@ TEST_F(NavigationControllerTest, ReloadOriginalRequestURL) { // Load up the original URL, but get redirected. controller.LoadURL( - original_url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + original_url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(0U, notifications.size()); main_test_rfh()->SendNavigateWithOriginalRequestURL( 0, final_url, original_url); @@ -1300,7 +1315,8 @@ TEST_F(NavigationControllerTest, ReloadOriginalRequestURL) { TEST_F(NavigationControllerTest, ResetEntryValuesAfterCommit) { NavigationControllerImpl& controller = controller_impl(); const GURL url1("http://foo1"); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Set up some sample values. const unsigned char* raw_data = @@ -1346,7 +1362,8 @@ TEST_F(NavigationControllerTest, ResetEntryValuesAfterCommit) { TEST_F(NavigationControllerTest, RedirectsAreNotResetByCommit) { NavigationControllerImpl& controller = controller_impl(); const GURL url1("http://foo1"); - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Set up some redirect values. std::vector<GURL> redirects; @@ -1437,12 +1454,13 @@ TEST_F(NavigationControllerTest, Back_GeneratesNewPage) { const GURL url3("http://foo/3"); controller.LoadURL( - url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, url1); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; - controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(1, url2); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; @@ -1489,13 +1507,14 @@ TEST_F(NavigationControllerTest, Back_NewPending) { EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; - // controller.LoadURL(kUrl2, PAGE_TRANSITION_TYPED); + // controller.LoadURL(kUrl2, ui::PAGE_TRANSITION_TYPED); main_test_rfh()->SendNavigate(1, kUrl2); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; // Now start a new pending navigation and go back before it commits. - controller.LoadURL(kUrl3, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + kUrl3, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(-1, controller.GetPendingEntryIndex()); EXPECT_EQ(kUrl3, controller.GetPendingEntry()->GetURL()); controller.GoBack(); @@ -1678,7 +1697,8 @@ TEST_F(NavigationControllerTest, Redirect) { const GURL url2("http://foo2"); // Redirection target // First request - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(0U, notifications.size()); main_test_rfh()->SendNavigate(0, url2); @@ -1686,7 +1706,8 @@ TEST_F(NavigationControllerTest, Redirect) { navigation_entry_committed_counter_ = 0; // Second request - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(controller.GetPendingEntry()); EXPECT_EQ(controller.GetPendingEntryIndex(), -1); @@ -1695,7 +1716,7 @@ TEST_F(NavigationControllerTest, Redirect) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 0; params.url = url2; - params.transition = PAGE_TRANSITION_SERVER_REDIRECT; + params.transition = ui::PAGE_TRANSITION_SERVER_REDIRECT; params.redirects.push_back(GURL("http://foo1")); params.redirects.push_back(GURL("http://foo2")); params.should_update_history = false; @@ -1735,7 +1756,8 @@ TEST_F(NavigationControllerTest, PostThenRedirect) { const GURL url2("http://foo2"); // Redirection target // First request as POST - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); controller.GetVisibleEntry()->SetHasPostData(true); EXPECT_EQ(0U, notifications.size()); @@ -1744,7 +1766,8 @@ TEST_F(NavigationControllerTest, PostThenRedirect) { navigation_entry_committed_counter_ = 0; // Second request - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(controller.GetPendingEntry()); EXPECT_EQ(controller.GetPendingEntryIndex(), -1); @@ -1753,7 +1776,7 @@ TEST_F(NavigationControllerTest, PostThenRedirect) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 0; params.url = url2; - params.transition = PAGE_TRANSITION_SERVER_REDIRECT; + params.transition = ui::PAGE_TRANSITION_SERVER_REDIRECT; params.redirects.push_back(GURL("http://foo1")); params.redirects.push_back(GURL("http://foo2")); params.should_update_history = false; @@ -1792,7 +1815,8 @@ TEST_F(NavigationControllerTest, ImmediateRedirect) { const GURL url2("http://foo2"); // Redirection target // First request - controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(controller.GetPendingEntry()); EXPECT_EQ(controller.GetPendingEntryIndex(), -1); @@ -1801,7 +1825,7 @@ TEST_F(NavigationControllerTest, ImmediateRedirect) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 0; params.url = url2; - params.transition = PAGE_TRANSITION_SERVER_REDIRECT; + params.transition = ui::PAGE_TRANSITION_SERVER_REDIRECT; params.redirects.push_back(GURL("http://foo1")); params.redirects.push_back(GURL("http://foo2")); params.should_update_history = false; @@ -1845,7 +1869,7 @@ TEST_F(NavigationControllerTest, NewSubframe) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 1; params.url = url2; - params.transition = PAGE_TRANSITION_MANUAL_SUBFRAME; + params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; params.should_update_history = false; params.gesture = NavigationGestureUser; params.is_post = false; @@ -1882,7 +1906,7 @@ TEST_F(NavigationControllerTest, SubframeOnEmptyPage) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 1; params.url = url; - params.transition = PAGE_TRANSITION_AUTO_SUBFRAME; + params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; params.should_update_history = false; params.gesture = NavigationGestureAuto; params.is_post = false; @@ -1910,7 +1934,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 0; params.url = url2; - params.transition = PAGE_TRANSITION_AUTO_SUBFRAME; + params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; params.should_update_history = false; params.gesture = NavigationGestureUser; params.is_post = false; @@ -1943,7 +1967,7 @@ TEST_F(NavigationControllerTest, BackSubframe) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 1; params.url = url2; - params.transition = PAGE_TRANSITION_MANUAL_SUBFRAME; + params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; params.should_update_history = false; params.gesture = NavigationGestureUser; params.is_post = false; @@ -2037,7 +2061,7 @@ TEST_F(NavigationControllerTest, InPage) { FrameHostMsg_DidCommitProvisionalLoad_Params self_params; self_params.page_id = 0; self_params.url = url1; - self_params.transition = PAGE_TRANSITION_LINK; + self_params.transition = ui::PAGE_TRANSITION_LINK; self_params.should_update_history = false; self_params.gesture = NavigationGestureUser; self_params.is_post = false; @@ -2058,7 +2082,7 @@ TEST_F(NavigationControllerTest, InPage) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 1; params.url = url2; - params.transition = PAGE_TRANSITION_LINK; + params.transition = ui::PAGE_TRANSITION_LINK; params.should_update_history = false; params.gesture = NavigationGestureUser; params.is_post = false; @@ -2146,7 +2170,7 @@ TEST_F(NavigationControllerTest, InPage_Replace) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 0; // Same page_id params.url = url2; - params.transition = PAGE_TRANSITION_LINK; + params.transition = ui::PAGE_TRANSITION_LINK; params.should_update_history = false; params.gesture = NavigationGestureUser; params.is_post = false; @@ -2197,7 +2221,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 1; // Same page_id params.url = url; - params.transition = PAGE_TRANSITION_LINK; + params.transition = ui::PAGE_TRANSITION_LINK; params.redirects.push_back(url); params.should_update_history = true; params.gesture = NavigationGestureUnknown; @@ -2222,7 +2246,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 2; // New page_id params.url = url; - params.transition = PAGE_TRANSITION_CLIENT_REDIRECT; + params.transition = ui::PAGE_TRANSITION_CLIENT_REDIRECT; params.redirects.push_back(GURL("http://foo2/#a")); params.redirects.push_back(url); params.should_update_history = true; @@ -2308,7 +2332,7 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) { for (url_index = 0; url_index < kMaxEntryCount; url_index++) { GURL url(base::StringPrintf("http://www.a.com/%d", url_index)); controller.LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(url_index, url); } @@ -2320,7 +2344,7 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) { // Navigate some more. GURL url(base::StringPrintf("http://www.a.com/%d", url_index)); controller.LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(url_index, url); url_index++; @@ -2338,7 +2362,7 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) { for (int i = 0; i < 3; i++) { url = GURL(base::StringPrintf("http:////www.a.com/%d", url_index)); controller.LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(url_index, url); url_index++; } @@ -2357,7 +2381,7 @@ TEST_F(NavigationControllerTest, RestoreNavigate) { GURL url("http://foo"); std::vector<NavigationEntry*> entries; NavigationEntry* entry = NavigationControllerImpl::CreateNavigationEntry( - url, Referrer(), PAGE_TRANSITION_RELOAD, false, std::string(), + url, Referrer(), ui::PAGE_TRANSITION_RELOAD, false, std::string(), browser_context()); entry->SetPageID(0); entry->SetTitle(base::ASCIIToUTF16("Title")); @@ -2403,7 +2427,7 @@ TEST_F(NavigationControllerTest, RestoreNavigate) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 0; params.url = url; - params.transition = PAGE_TRANSITION_LINK; + params.transition = ui::PAGE_TRANSITION_LINK; params.should_update_history = false; params.gesture = NavigationGestureUser; params.is_post = false; @@ -2437,7 +2461,7 @@ TEST_F(NavigationControllerTest, RestoreNavigateAfterFailure) { GURL url("http://foo"); std::vector<NavigationEntry*> entries; NavigationEntry* entry = NavigationControllerImpl::CreateNavigationEntry( - url, Referrer(), PAGE_TRANSITION_RELOAD, false, std::string(), + url, Referrer(), ui::PAGE_TRANSITION_RELOAD, false, std::string(), browser_context()); entry->SetPageID(0); entry->SetTitle(base::ASCIIToUTF16("Title")); @@ -2486,7 +2510,7 @@ TEST_F(NavigationControllerTest, RestoreNavigateAfterFailure) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 0; params.url = url; - params.transition = PAGE_TRANSITION_LINK; + params.transition = ui::PAGE_TRANSITION_LINK; params.should_update_history = false; params.gesture = NavigationGestureUser; params.is_post = false; @@ -2514,13 +2538,13 @@ TEST_F(NavigationControllerTest, Interstitial) { // First navigate somewhere normal. const GURL url1("http://foo"); controller.LoadURL( - url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, url1); // Now navigate somewhere with an interstitial. const GURL url2("http://bar"); controller.LoadURL( - url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); NavigationEntryImpl::FromNavigationEntry(controller.GetPendingEntry())-> set_page_type(PAGE_TYPE_INTERSTITIAL); @@ -2545,19 +2569,19 @@ TEST_F(NavigationControllerTest, RemoveEntry) { const GURL default_url("http://foo/default"); controller.LoadURL( - url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, url1); controller.LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(1, url2); controller.LoadURL( - url3, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url3, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(2, url3); controller.LoadURL( - url4, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url4, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(3, url4); controller.LoadURL( - url5, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url5, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(4, url5); // Try to remove the last entry. Will fail because it is the current entry. @@ -2608,10 +2632,10 @@ TEST_F(NavigationControllerTest, TransientEntry) { const GURL transient_url("http://foo/transient"); controller.LoadURL( - url0, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url0, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, url0); controller.LoadURL( - url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(1, url1); notifications.Reset(); @@ -2637,7 +2661,7 @@ TEST_F(NavigationControllerTest, TransientEntry) { // Navigate. controller.LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(2, url2); // We should have navigated, transient entry should be gone. @@ -2656,7 +2680,7 @@ TEST_F(NavigationControllerTest, TransientEntry) { // Initiate a navigation, add a transient then commit navigation. controller.LoadURL( - url4, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url4, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); transient_entry = new NavigationEntryImpl; transient_entry->SetURL(transient_url); controller.SetTransientEntry(transient_entry); @@ -2748,10 +2772,10 @@ TEST_F(NavigationControllerTest, ReloadTransient) { // Load |url0|, and start a pending navigation to |url1|. controller.LoadURL( - url0, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url0, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); main_test_rfh()->SendNavigate(0, url0); controller.LoadURL( - url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // A transient entry is added, interrupting the navigation. NavigationEntryImpl* transient_entry = new NavigationEntryImpl; @@ -2850,7 +2874,8 @@ TEST_F(NavigationControllerTest, DontShowRendererURLUntilCommit) { // For typed navigations (browser-initiated), both pending and visible entries // should update before commit. - controller.LoadURL(url0, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller.LoadURL( + url0, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(url0, controller.GetPendingEntry()->GetURL()); EXPECT_EQ(url0, controller.GetVisibleEntry()->GetURL()); main_test_rfh()->SendNavigate(0, url0); @@ -2893,7 +2918,7 @@ TEST_F(NavigationControllerTest, ShowRendererURLInNewTabUntilModified) { // we show the pending entry's URL as long as the about:blank page is not // modified. NavigationController::LoadURLParams load_url_params(url); - load_url_params.transition_type = PAGE_TRANSITION_LINK; + load_url_params.transition_type = ui::PAGE_TRANSITION_LINK; load_url_params.is_renderer_initiated = true; controller.LoadURLWithParams(load_url_params); EXPECT_EQ(url, controller.GetVisibleEntry()->GetURL()); @@ -2933,7 +2958,7 @@ TEST_F(NavigationControllerTest, ShowBrowserURLAfterFailUntilModified) { // modified. This is possible in cases that the user types a URL into a popup // tab created with a slow URL. NavigationController::LoadURLParams load_url_params(url); - load_url_params.transition_type = PAGE_TRANSITION_TYPED; + load_url_params.transition_type = ui::PAGE_TRANSITION_TYPED; load_url_params.is_renderer_initiated = false; controller.LoadURLWithParams(load_url_params); EXPECT_EQ(url, controller.GetVisibleEntry()->GetURL()); @@ -2984,7 +3009,7 @@ TEST_F(NavigationControllerTest, ShowRendererURLAfterFailUntilModified) { // we show the pending entry's URL as long as the about:blank page is not // modified. NavigationController::LoadURLParams load_url_params(url); - load_url_params.transition_type = PAGE_TRANSITION_LINK; + load_url_params.transition_type = ui::PAGE_TRANSITION_LINK; load_url_params.is_renderer_initiated = true; controller.LoadURLWithParams(load_url_params); EXPECT_EQ(url, controller.GetVisibleEntry()->GetURL()); @@ -3031,7 +3056,7 @@ TEST_F(NavigationControllerTest, DontShowRendererURLInNewTabAfterCommit) { // we show the pending entry's URL as long as the about:blank page is not // modified. NavigationController::LoadURLParams load_url_params(url1); - load_url_params.transition_type = PAGE_TRANSITION_LINK; + load_url_params.transition_type = ui::PAGE_TRANSITION_LINK; load_url_params.is_renderer_initiated = true; controller.LoadURLWithParams(load_url_params); EXPECT_EQ(url1, controller.GetVisibleEntry()->GetURL()); @@ -3044,7 +3069,7 @@ TEST_F(NavigationControllerTest, DontShowRendererURLInNewTabAfterCommit) { // Simulate a commit and then starting a new pending navigation. main_test_rfh()->SendNavigate(0, url1); NavigationController::LoadURLParams load_url2_params(url2); - load_url2_params.transition_type = PAGE_TRANSITION_LINK; + load_url2_params.transition_type = ui::PAGE_TRANSITION_LINK; load_url2_params.is_renderer_initiated = true; controller.LoadURLWithParams(load_url2_params); @@ -3148,7 +3173,7 @@ TEST_F(NavigationControllerTest, SameSubframe) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 0; params.url = subframe; - params.transition = PAGE_TRANSITION_AUTO_SUBFRAME; + params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; params.should_update_history = false; params.gesture = NavigationGestureAuto; params.is_post = false; @@ -3256,7 +3281,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) { // Now start a pending load to a totally different page, but don't commit it. const GURL url2("http://bar/"); controller.LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Send a subframe update from the first page, as if one had just // automatically loaded. Auto subframes don't increment the page ID. @@ -3264,7 +3289,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = controller.GetLastCommittedEntry()->GetPageID(); params.url = url1_sub; - params.transition = PAGE_TRANSITION_AUTO_SUBFRAME; + params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; params.should_update_history = false; params.gesture = NavigationGestureAuto; params.is_post = false; @@ -3527,7 +3552,7 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPruneTargetPending) { NavigationControllerImpl& other_controller = other_contents->GetController(); other_contents->NavigateAndCommit(url3); other_controller.LoadURL( - url4, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url4, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); other_contents->ExpectSetHistoryLengthAndPrune( GetSiteInstanceFromEntry(other_controller.GetEntryAtIndex(0)), 1, other_controller.GetEntryAtIndex(0)->GetPageID()); @@ -3571,7 +3596,7 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPruneTargetPending2) { other_contents->NavigateAndCommit(url2a); // Simulate a client redirect, which has the same page ID as entry 2a. other_controller.LoadURL( - url2b, Referrer(), PAGE_TRANSITION_LINK, std::string()); + url2b, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); other_controller.GetPendingEntry()->SetPageID( other_controller.GetLastCommittedEntry()->GetPageID()); @@ -3807,7 +3832,7 @@ TEST_F(NavigationControllerTest, CopyRestoredStateAndNavigate) { std::vector<NavigationEntry*> entries; for (size_t i = 0; i < arraysize(kRestoredUrls); ++i) { NavigationEntry* entry = NavigationControllerImpl::CreateNavigationEntry( - kRestoredUrls[i], Referrer(), PAGE_TRANSITION_RELOAD, false, + kRestoredUrls[i], Referrer(), ui::PAGE_TRANSITION_RELOAD, false, std::string(), browser_context()); entry->SetPageID(static_cast<int>(i)); entries.push_back(entry); @@ -3976,7 +4001,7 @@ TEST_F(NavigationControllerTest, PruneAllButLastCommittedForPendingNotInList) { // Create a pending entry that is not in the entry list. controller.LoadURL( - url3, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url3, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(controller.GetPendingEntry()); EXPECT_EQ(2, controller.GetEntryCount()); @@ -4043,7 +4068,7 @@ TEST_F(NavigationControllerTest, IsInitialNavigation) { // After starting a new navigation, it stays false. const GURL url2("http://foo2"); controller.LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); } // Check that the favicon is not reused across a client redirect. @@ -4076,7 +4101,7 @@ TEST_F(NavigationControllerTest, ClearFaviconOnRedirect) { main_test_rfh()->SendNavigateWithTransition( 0, // same page ID. kPageWithoutFavicon, - PAGE_TRANSITION_CLIENT_REDIRECT); + ui::PAGE_TRANSITION_CLIENT_REDIRECT); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; @@ -4118,7 +4143,7 @@ TEST_F(NavigationControllerTest, BackNavigationDoesNotClearFavicon) { main_test_rfh()->SendNavigateWithTransition( 0, kUrl1, - PAGE_TRANSITION_FORWARD_BACK); + ui::PAGE_TRANSITION_FORWARD_BACK); EXPECT_EQ(1U, navigation_entry_committed_counter_); navigation_entry_committed_counter_ = 0; @@ -4315,7 +4340,7 @@ TEST_F(NavigationControllerTest, PostThenReplaceStateThenReload) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 1; params.url = url; - params.transition = PAGE_TRANSITION_FORM_SUBMIT; + params.transition = ui::PAGE_TRANSITION_FORM_SUBMIT; params.gesture = NavigationGestureUser; params.page_state = PageState::CreateFromURL(url); params.was_within_same_page = false; @@ -4327,7 +4352,7 @@ TEST_F(NavigationControllerTest, PostThenReplaceStateThenReload) { GURL replace_url("http://foo#foo"); params.page_id = 1; params.url = replace_url; - params.transition = PAGE_TRANSITION_LINK; + params.transition = ui::PAGE_TRANSITION_LINK; params.gesture = NavigationGestureUser; params.page_state = PageState::CreateFromURL(replace_url); params.was_within_same_page = true; diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc index b021d5e..7105608 100644 --- a/content/browser/frame_host/navigation_entry_impl.cc +++ b/content/browser/frame_host/navigation_entry_impl.cc @@ -43,7 +43,7 @@ NavigationEntryImpl::NavigationEntryImpl() page_type_(PAGE_TYPE_NORMAL), update_virtual_url_with_url_(false), page_id_(-1), - transition_type_(PAGE_TRANSITION_LINK), + transition_type_(ui::PAGE_TRANSITION_LINK), has_post_data_(false), post_id_(-1), restore_type_(RESTORE_NONE), @@ -61,7 +61,7 @@ NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance, const GURL& url, const Referrer& referrer, const base::string16& title, - PageTransition transition_type, + ui::PageTransition transition_type, bool is_renderer_initiated) : unique_id_(GetUniqueIDInConstructor()), site_instance_(instance), @@ -202,11 +202,11 @@ bool NavigationEntryImpl::IsViewSourceMode() const { } void NavigationEntryImpl::SetTransitionType( - PageTransition transition_type) { + ui::PageTransition transition_type) { transition_type_ = transition_type; } -PageTransition NavigationEntryImpl::GetTransitionType() const { +ui::PageTransition NavigationEntryImpl::GetTransitionType() const { return transition_type_; } diff --git a/content/browser/frame_host/navigation_entry_impl.h b/content/browser/frame_host/navigation_entry_impl.h index 613f45e..e1f243f 100644 --- a/content/browser/frame_host/navigation_entry_impl.h +++ b/content/browser/frame_host/navigation_entry_impl.h @@ -30,7 +30,7 @@ class CONTENT_EXPORT NavigationEntryImpl const GURL& url, const Referrer& referrer, const base::string16& title, - PageTransition transition_type, + ui::PageTransition transition_type, bool is_renderer_initiated); virtual ~NavigationEntryImpl(); @@ -54,8 +54,8 @@ class CONTENT_EXPORT NavigationEntryImpl virtual const base::string16& GetTitleForDisplay( const std::string& languages) const OVERRIDE; virtual bool IsViewSourceMode() const OVERRIDE; - virtual void SetTransitionType(PageTransition transition_type) OVERRIDE; - virtual PageTransition GetTransitionType() const OVERRIDE; + virtual void SetTransitionType(ui::PageTransition transition_type) OVERRIDE; + virtual ui::PageTransition GetTransitionType() const OVERRIDE; virtual const GURL& GetUserTypedURL() const OVERRIDE; virtual void SetHasPostData(bool has_post_data) OVERRIDE; virtual bool GetHasPostData() const OVERRIDE; @@ -241,7 +241,7 @@ class CONTENT_EXPORT NavigationEntryImpl PageState page_state_; int32 page_id_; SSLStatus ssl_; - PageTransition transition_type_; + ui::PageTransition transition_type_; GURL user_typed_url_; bool has_post_data_; int64 post_id_; diff --git a/content/browser/frame_host/navigation_entry_impl_unittest.cc b/content/browser/frame_host/navigation_entry_impl_unittest.cc index 7976801..8dae01b 100644 --- a/content/browser/frame_host/navigation_entry_impl_unittest.cc +++ b/content/browser/frame_host/navigation_entry_impl_unittest.cc @@ -31,7 +31,7 @@ class NavigationEntryTest : public testing::Test { GURL("test:url"), Referrer(GURL("from"), blink::WebReferrerPolicyDefault), ASCIIToUTF16("title"), - PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false)); } @@ -156,10 +156,10 @@ TEST_F(NavigationEntryTest, NavigationEntryAccessors) { EXPECT_EQ(2, entry2_->GetPageID()); // Transition type - EXPECT_EQ(PAGE_TRANSITION_LINK, entry1_->GetTransitionType()); - EXPECT_EQ(PAGE_TRANSITION_TYPED, entry2_->GetTransitionType()); - entry2_->SetTransitionType(PAGE_TRANSITION_RELOAD); - EXPECT_EQ(PAGE_TRANSITION_RELOAD, entry2_->GetTransitionType()); + EXPECT_EQ(ui::PAGE_TRANSITION_LINK, entry1_->GetTransitionType()); + EXPECT_EQ(ui::PAGE_TRANSITION_TYPED, entry2_->GetTransitionType()); + entry2_->SetTransitionType(ui::PAGE_TRANSITION_RELOAD); + EXPECT_EQ(ui::PAGE_TRANSITION_RELOAD, entry2_->GetTransitionType()); // Is renderer initiated EXPECT_FALSE(entry1_->is_renderer_initiated()); diff --git a/content/browser/frame_host/navigation_request_info.h b/content/browser/frame_host/navigation_request_info.h index 4342863..cc6d5a7 100644 --- a/content/browser/frame_host/navigation_request_info.h +++ b/content/browser/frame_host/navigation_request_info.h @@ -9,7 +9,6 @@ #include "base/basictypes.h" #include "content/common/frame_messages.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "url/gurl.h" diff --git a/content/browser/frame_host/navigator.h b/content/browser/frame_host/navigator.h index b476548..af8e71e 100644 --- a/content/browser/frame_host/navigator.h +++ b/content/browser/frame_host/navigator.h @@ -114,7 +114,7 @@ class CONTENT_EXPORT Navigator : public base::RefCounted<Navigator> { const GURL& url, const std::vector<GURL>& redirect_chain, const Referrer& referrer, - PageTransition page_transition, + ui::PageTransition page_transition, WindowOpenDisposition disposition, const GlobalRequestID& transferred_global_request_id, bool should_replace_current_entry, diff --git a/content/browser/frame_host/navigator_delegate.h b/content/browser/frame_host/navigator_delegate.h index 718c3b8..5669c5c 100644 --- a/content/browser/frame_host/navigator_delegate.h +++ b/content/browser/frame_host/navigator_delegate.h @@ -8,7 +8,7 @@ #include "base/strings/string16.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/navigation_controller.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" class GURL; @@ -58,7 +58,7 @@ class CONTENT_EXPORT NavigatorDelegate { virtual void DidCommitProvisionalLoad( RenderFrameHostImpl* render_frame_host, const GURL& url, - PageTransition transition_type) {} + ui::PageTransition transition_type) {} // Handles post-navigation tasks in navigation BEFORE the entry has been // committed to the NavigationController. diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc index ea9f921..384bcee 100644 --- a/content/browser/frame_host/navigator_impl.cc +++ b/content/browser/frame_host/navigator_impl.cc @@ -136,7 +136,7 @@ void NavigatorImpl::MakeNavigateParams( // Set the redirect chain to the navigation's redirects, unless we are // returning to a completed navigation (whose previous redirects don't apply). - if (PageTransitionIsNewNavigation(params->transition)) { + if (ui::PageTransitionIsNewNavigation(params->transition)) { params->redirects = entry.GetRedirectChain(); } else { params->redirects.clear(); @@ -176,7 +176,7 @@ void NavigatorImpl::DidStartProvisionalLoad( NavigationEntryImpl* entry = NavigationEntryImpl::FromNavigationEntry( controller_->CreateNavigationEntry(validated_url, content::Referrer(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, true /* is_renderer_initiated */, std::string(), controller_->GetBrowserContext())); @@ -447,11 +447,11 @@ void NavigatorImpl::DidNavigate( pending_entry && pending_entry->frame_tree_node_id() == render_frame_host->frame_tree_node()->frame_tree_node_id()) { - params.transition = PAGE_TRANSITION_AUTO_SUBFRAME; + params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; } } - if (PageTransitionIsMainFrame(params.transition)) { + if (ui::PageTransitionIsMainFrame(params.transition)) { if (delegate_) { // When overscroll navigation gesture is enabled, a screenshot of the page // in its current state is taken so that it can be used during the @@ -507,7 +507,7 @@ void NavigatorImpl::DidNavigate( // TODO(nasko): Verify the correctness of the above comment, since some of the // code doesn't exist anymore. Also, move this code in the // PageTransitionIsMainFrame code block above. - if (PageTransitionIsMainFrame(params.transition) && delegate_) + if (ui::PageTransitionIsMainFrame(params.transition) && delegate_) delegate_->SetMainFrameMimeType(params.contents_mime_type); LoadCommittedDetails details; @@ -525,15 +525,15 @@ void NavigatorImpl::DidNavigate( if (details.type != NAVIGATION_TYPE_NAV_IGNORE && delegate_) { DCHECK_EQ(!render_frame_host->GetParent(), did_navigate ? details.is_main_frame : false); - PageTransition transition_type = params.transition; + ui::PageTransition transition_type = params.transition; // Whether or not a page transition was triggered by going backward or // forward in the history is only stored in the navigation controller's // entry list. if (did_navigate && (controller_->GetLastCommittedEntry()->GetTransitionType() & - PAGE_TRANSITION_FORWARD_BACK)) { - transition_type = PageTransitionFromInt( - params.transition | PAGE_TRANSITION_FORWARD_BACK); + ui::PAGE_TRANSITION_FORWARD_BACK)) { + transition_type = ui::PageTransitionFromInt( + params.transition | ui::PAGE_TRANSITION_FORWARD_BACK); } delegate_->DidCommitProvisionalLoad(render_frame_host, @@ -593,10 +593,15 @@ void NavigatorImpl::RequestOpenURL( // TODO(creis): Pass the redirect_chain into this method to support client // redirects. http://crbug.com/311721. std::vector<GURL> redirect_chain; - RequestTransferURL( - render_frame_host, url, redirect_chain, referrer, PAGE_TRANSITION_LINK, - disposition, GlobalRequestID(), - should_replace_current_entry, user_gesture); + RequestTransferURL(render_frame_host, + url, + redirect_chain, + referrer, + ui::PAGE_TRANSITION_LINK, + disposition, + GlobalRequestID(), + should_replace_current_entry, + user_gesture); } void NavigatorImpl::RequestTransferURL( @@ -604,7 +609,7 @@ void NavigatorImpl::RequestTransferURL( const GURL& url, const std::vector<GURL>& redirect_chain, const Referrer& referrer, - PageTransition page_transition, + ui::PageTransition page_transition, WindowOpenDisposition disposition, const GlobalRequestID& transferred_global_request_id, bool should_replace_current_entry, @@ -638,7 +643,8 @@ void NavigatorImpl::RequestTransferURL( // link clicks (e.g., so the new tab page can specify AUTO_BOOKMARK for // automatically generated suggestions). We don't override other types // like TYPED because they have different implications (e.g., autocomplete). - if (PageTransitionCoreTypeIs(params.transition, PAGE_TRANSITION_LINK)) + if (ui::PageTransitionCoreTypeIs( + params.transition, ui::PAGE_TRANSITION_LINK)) params.transition = GetRenderManager(render_frame_host)->web_ui()-> GetLinkTransitionType(); diff --git a/content/browser/frame_host/navigator_impl.h b/content/browser/frame_host/navigator_impl.h index 4226293..2d87a5b 100644 --- a/content/browser/frame_host/navigator_impl.h +++ b/content/browser/frame_host/navigator_impl.h @@ -69,7 +69,7 @@ class CONTENT_EXPORT NavigatorImpl : public Navigator { const GURL& url, const std::vector<GURL>& redirect_chain, const Referrer& referrer, - PageTransition page_transition, + ui::PageTransition page_transition, WindowOpenDisposition disposition, const GlobalRequestID& transferred_global_request_id, bool should_replace_current_entry, diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc index 1e22e7a..fbb1831 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc @@ -680,7 +680,7 @@ void RenderFrameHostImpl::OnDidCommitProvisionalLoad(const IPC::Message& msg) { // to allow the pending navigation to continue. if (render_view_host_->is_waiting_for_beforeunload_ack_ && render_view_host_->unload_ack_is_for_cross_site_transition_ && - PageTransitionIsMainFrame(validated_params.transition)) { + ui::PageTransitionIsMainFrame(validated_params.transition)) { OnBeforeUnloadACK(true, send_before_unload_start_time_, base::TimeTicks::Now()); return; @@ -746,7 +746,7 @@ void RenderFrameHostImpl::OnCrossSiteResponse( scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request, const std::vector<GURL>& transfer_url_chain, const Referrer& referrer, - PageTransition page_transition, + ui::PageTransition page_transition, bool should_replace_current_entry) { frame_tree_node_->render_manager()->OnCrossSiteResponse( this, global_request_id, cross_site_transferring_request.Pass(), @@ -1222,7 +1222,7 @@ void RenderFrameHostImpl::NavigateToURL(const GURL& url) { params.current_history_list_offset = -1; params.current_history_list_length = 0; params.url = url; - params.transition = PAGE_TRANSITION_LINK; + params.transition = ui::PAGE_TRANSITION_LINK; params.navigation_type = FrameMsg_Navigate_Type::NORMAL; params.browser_navigation_start = base::TimeTicks::Now(); Navigate(params); diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h index 1d814e8..67b4a41 100644 --- a/content/browser/frame_host/render_frame_host_impl.h +++ b/content/browser/frame_host/render_frame_host_impl.h @@ -20,11 +20,11 @@ #include "content/common/mojo/service_registry_impl.h" #include "content/public/browser/render_frame_host.h" #include "content/public/common/javascript_message_type.h" -#include "content/public/common/page_transition_types.h" #include "net/http/http_response_headers.h" #include "third_party/WebKit/public/platform/WebNotificationPermission.h" #include "third_party/WebKit/public/web/WebTextDirection.h" #include "ui/accessibility/ax_node_data.h" +#include "ui/base/page_transition_types.h" class GURL; struct AccessibilityHostMsg_EventParams; @@ -175,7 +175,7 @@ class CONTENT_EXPORT RenderFrameHostImpl scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request, const std::vector<GURL>& transfer_url_chain, const Referrer& referrer, - PageTransition page_transition, + ui::PageTransition page_transition, bool should_replace_current_entry); // Called on the current RenderFrameHost when the network response is first diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc index b97c76b..52bd32f 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc @@ -358,7 +358,7 @@ void RenderFrameHostManager::OnCrossSiteResponse( scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request, const std::vector<GURL>& transfer_url_chain, const Referrer& referrer, - PageTransition page_transition, + ui::PageTransition page_transition, bool should_replace_current_entry) { // We should only get here for transfer navigations. Most cross-process // navigations can just continue and wait to run the unload handler (by @@ -802,7 +802,7 @@ bool RenderFrameHostManager::ShouldReuseWebUI( SiteInstance* RenderFrameHostManager::GetSiteInstanceForNavigation( const GURL& dest_url, SiteInstance* dest_instance, - PageTransition dest_transition, + ui::PageTransition dest_transition, bool dest_is_restore, bool dest_is_view_source_mode) { SiteInstance* current_instance = render_frame_host_->GetSiteInstance(); @@ -856,7 +856,7 @@ SiteInstance* RenderFrameHostManager::GetSiteInstanceForNavigation( SiteInstance* RenderFrameHostManager::GetSiteInstanceForURL( const GURL& dest_url, SiteInstance* dest_instance, - PageTransition dest_transition, + ui::PageTransition dest_transition, bool dest_is_restore, bool dest_is_view_source_mode, SiteInstance* current_instance, @@ -891,7 +891,8 @@ SiteInstance* RenderFrameHostManager::GetSiteInstanceForURL( // RenderViews in response to a link click. // if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessPerSite) && - PageTransitionCoreTypeIs(dest_transition, PAGE_TRANSITION_GENERATED)) { + ui::PageTransitionCoreTypeIs( + dest_transition, ui::PAGE_TRANSITION_GENERATED)) { return current_instance; } diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h index 9a6ded5..4ca4546 100644 --- a/content/browser/frame_host/render_frame_host_manager.h +++ b/content/browser/frame_host/render_frame_host_manager.h @@ -16,6 +16,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/common/referrer.h" +#include "ui/base/page_transition_types.h" struct FrameHostMsg_BeginNavigation_Params; struct FrameMsg_Navigate_Params; @@ -232,7 +233,7 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request, const std::vector<GURL>& transfer_url_chain, const Referrer& referrer, - PageTransition page_transition, + ui::PageTransition page_transition, bool should_replace_current_entry); // Received a response from CrossSiteResourceHandler. If the navigation @@ -382,7 +383,7 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { SiteInstance* GetSiteInstanceForNavigation( const GURL& dest_url, SiteInstance* dest_instance, - PageTransition dest_transition, + ui::PageTransition dest_transition, bool dest_is_restore, bool dest_is_view_source_mode); @@ -394,7 +395,7 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { SiteInstance* GetSiteInstanceForURL( const GURL& dest_url, SiteInstance* dest_instance, - PageTransition dest_transition, + ui::PageTransition dest_transition, bool dest_is_restore, bool dest_is_view_source_mode, SiteInstance* current_instance, diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc index 468b01e..b23ecc9 100644 --- a/content/browser/frame_host/render_frame_host_manager_unittest.cc +++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc @@ -29,7 +29,6 @@ #include "content/public/common/bindings_policy.h" #include "content/public/common/content_switches.h" #include "content/public/common/javascript_message_type.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/url_constants.h" #include "content/public/common/url_utils.h" #include "content/public/test/mock_render_process_host.h" @@ -40,6 +39,7 @@ #include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" namespace content { namespace { @@ -278,7 +278,8 @@ class RenderFrameHostManagerTest // Note: we navigate the active RenderFrameHost because previous navigations // won't have committed yet, so NavigateAndCommit does the wrong thing // for us. - controller().LoadURL(url, Referrer(), PAGE_TRANSITION_LINK, std::string()); + controller().LoadURL( + url, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); TestRenderViewHost* old_rvh = test_rvh(); // Simulate the BeforeUnload_ACK that is received from the current renderer @@ -355,7 +356,7 @@ class RenderFrameHostManagerTest // Navigate to a cross-site URL. contents()->GetController().LoadURL( - kDestUrl, Referrer(), PAGE_TRANSITION_LINK, std::string()); + kDestUrl, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); EXPECT_TRUE(contents()->cross_navigation_pending()); // Manually increase the number of active views in the @@ -417,7 +418,7 @@ TEST_F(RenderFrameHostManagerTest, NewTabPageProcesses) { // a RFH that's not pending (since there is no cross-site transition), so // we use the committed one. contents2->GetController().LoadURL( - kChromeUrl, Referrer(), PAGE_TRANSITION_LINK, std::string()); + kChromeUrl, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); TestRenderFrameHost* ntp_rfh2 = contents2->GetMainFrame(); EXPECT_FALSE(contents2->cross_navigation_pending()); ntp_rfh2->SendNavigate(100, kChromeUrl); @@ -425,7 +426,7 @@ TEST_F(RenderFrameHostManagerTest, NewTabPageProcesses) { // The second one is the opposite, creating a cross-site transition and // requiring a beforeunload ack. contents2->GetController().LoadURL( - kDestUrl, Referrer(), PAGE_TRANSITION_LINK, std::string()); + kDestUrl, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); EXPECT_TRUE(contents2->cross_navigation_pending()); TestRenderFrameHost* dest_rfh2 = contents2->GetPendingMainFrame(); ASSERT_TRUE(dest_rfh2); @@ -446,7 +447,7 @@ TEST_F(RenderFrameHostManagerTest, NewTabPageProcesses) { EXPECT_FALSE(contents()->GetPendingMainFrame()); contents2->GetController().LoadURL( - kChromeUrl, Referrer(), PAGE_TRANSITION_LINK, std::string()); + kChromeUrl, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); dest_rfh2->GetRenderViewHost()->SendBeforeUnloadACK(true); contents2->GetPendingMainFrame()->SendNavigate(102, kChromeUrl); @@ -739,7 +740,7 @@ TEST_F(RenderFrameHostManagerTest, AlwaysSendEnableViewSourceMode) { // Navigate. controller().LoadURL( - kUrl, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kUrl, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate response from RenderFrame for DispatchBeforeUnload. base::TimeTicks now = base::TimeTicks::Now(); contents()->GetMainFrame()->OnMessageReceived(FrameHostMsg_BeforeUnload_ACK( @@ -762,7 +763,7 @@ TEST_F(RenderFrameHostManagerTest, AlwaysSendEnableViewSourceMode) { process()->sink().ClearMessages(); // Navigate, again. controller().LoadURL( - kUrl, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kUrl, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // The same RenderViewHost should be reused. EXPECT_FALSE(contents()->GetPendingMainFrame()); EXPECT_TRUE(last_rfh == contents()->GetMainFrame()); @@ -817,7 +818,7 @@ TEST_F(RenderFrameHostManagerTest, Navigate) { const GURL kUrl1("http://www.google.com/"); NavigationEntryImpl entry1( NULL /* instance */, -1 /* page_id */, kUrl1, Referrer(), - base::string16() /* title */, PAGE_TRANSITION_TYPED, + base::string16() /* title */, ui::PAGE_TRANSITION_TYPED, false /* is_renderer_init */); host = manager->Navigate(entry1); @@ -839,7 +840,7 @@ TEST_F(RenderFrameHostManagerTest, Navigate) { NavigationEntryImpl entry2( NULL /* instance */, -1 /* page_id */, kUrl2, Referrer(kUrl1, blink::WebReferrerPolicyDefault), - base::string16() /* title */, PAGE_TRANSITION_LINK, + base::string16() /* title */, ui::PAGE_TRANSITION_LINK, true /* is_renderer_init */); host = manager->Navigate(entry2); @@ -859,7 +860,7 @@ TEST_F(RenderFrameHostManagerTest, Navigate) { NavigationEntryImpl entry3( NULL /* instance */, -1 /* page_id */, kUrl3, Referrer(kUrl2, blink::WebReferrerPolicyDefault), - base::string16() /* title */, PAGE_TRANSITION_LINK, + base::string16() /* title */, ui::PAGE_TRANSITION_LINK, false /* is_renderer_init */); host = manager->Navigate(entry3); @@ -897,7 +898,7 @@ TEST_F(RenderFrameHostManagerTest, WebUI) { const GURL kUrl("chrome://foo"); NavigationEntryImpl entry(NULL /* instance */, -1 /* page_id */, kUrl, Referrer(), base::string16() /* title */, - PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false /* is_renderer_init */); RenderFrameHostImpl* host = manager->Navigate(entry); @@ -948,7 +949,7 @@ TEST_F(RenderFrameHostManagerTest, WebUIInNewTab) { const GURL kUrl1("chrome://foo"); NavigationEntryImpl entry1(NULL /* instance */, -1 /* page_id */, kUrl1, Referrer(), base::string16() /* title */, - PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false /* is_renderer_init */); RenderFrameHostImpl* host1 = manager1->Navigate(entry1); @@ -979,7 +980,7 @@ TEST_F(RenderFrameHostManagerTest, WebUIInNewTab) { const GURL kUrl2("chrome://foo/bar"); NavigationEntryImpl entry2(NULL /* instance */, -1 /* page_id */, kUrl2, Referrer(), base::string16() /* title */, - PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, true /* is_renderer_init */); RenderFrameHostImpl* host2 = manager2->Navigate(entry2); @@ -1019,7 +1020,7 @@ TEST_F(RenderFrameHostManagerTest, PageDoesBackAndReload) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = 1; params.url = kUrl2; - params.transition = PAGE_TRANSITION_CLIENT_REDIRECT; + params.transition = ui::PAGE_TRANSITION_CLIENT_REDIRECT; params.should_update_history = false; params.gesture = NavigationGestureAuto; params.was_within_same_page = false; @@ -1396,7 +1397,7 @@ TEST_F(RenderFrameHostManagerTest, NoSwapOnGuestNavigations) { const GURL kUrl1("http://www.google.com/"); NavigationEntryImpl entry1( NULL /* instance */, -1 /* page_id */, kUrl1, Referrer(), - base::string16() /* title */, PAGE_TRANSITION_TYPED, + base::string16() /* title */, ui::PAGE_TRANSITION_TYPED, false /* is_renderer_init */); host = manager->Navigate(entry1); @@ -1419,7 +1420,7 @@ TEST_F(RenderFrameHostManagerTest, NoSwapOnGuestNavigations) { NavigationEntryImpl entry2( NULL /* instance */, -1 /* page_id */, kUrl2, Referrer(kUrl1, blink::WebReferrerPolicyDefault), - base::string16() /* title */, PAGE_TRANSITION_LINK, + base::string16() /* title */, ui::PAGE_TRANSITION_LINK, true /* is_renderer_init */); host = manager->Navigate(entry2); @@ -1455,7 +1456,7 @@ TEST_F(RenderFrameHostManagerTest, NavigateWithEarlyClose) { const GURL kUrl1("http://www.google.com/"); NavigationEntryImpl entry1(NULL /* instance */, -1 /* page_id */, kUrl1, Referrer(), base::string16() /* title */, - PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, false /* is_renderer_init */); RenderFrameHostImpl* host = manager->Navigate(entry1); @@ -1481,7 +1482,7 @@ TEST_F(RenderFrameHostManagerTest, NavigateWithEarlyClose) { const GURL kUrl2("http://www.example.com"); NavigationEntryImpl entry2( NULL /* instance */, -1 /* page_id */, kUrl2, Referrer(), - base::string16() /* title */, PAGE_TRANSITION_TYPED, + base::string16() /* title */, ui::PAGE_TRANSITION_TYPED, false /* is_renderer_init */); RenderFrameHostImpl* host2 = manager->Navigate(entry2); @@ -1519,7 +1520,8 @@ TEST_F(RenderFrameHostManagerTest, DeleteFrameAfterSwapOutACK) { rfh1->GetRenderViewHost()->rvh_state()); // Navigate to new site, simulating onbeforeunload approval. - controller().LoadURL(kUrl2, Referrer(), PAGE_TRANSITION_LINK, std::string()); + controller().LoadURL( + kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); base::TimeTicks now = base::TimeTicks::Now(); contents()->GetMainFrame()->OnMessageReceived( FrameHostMsg_BeforeUnload_ACK(0, true, now, now)); @@ -1536,7 +1538,7 @@ TEST_F(RenderFrameHostManagerTest, DeleteFrameAfterSwapOutACK) { rfh1->GetRenderViewHost()->rvh_state()); // The new page commits. - contents()->TestDidNavigate(rfh2, 1, kUrl2, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(rfh2, 1, kUrl2, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(rfh2, contents()->GetMainFrame()); EXPECT_TRUE(contents()->GetPendingMainFrame() == NULL); @@ -1572,7 +1574,8 @@ TEST_F(RenderFrameHostManagerTest, SwapOutFrameAfterSwapOutACK) { rfh1->GetSiteInstance())->increment_active_view_count(); // Navigate to new site, simulating onbeforeunload approval. - controller().LoadURL(kUrl2, Referrer(), PAGE_TRANSITION_LINK, std::string()); + controller().LoadURL( + kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); base::TimeTicks now = base::TimeTicks::Now(); contents()->GetMainFrame()->OnMessageReceived( FrameHostMsg_BeforeUnload_ACK(0, true, now, now)); @@ -1582,7 +1585,7 @@ TEST_F(RenderFrameHostManagerTest, SwapOutFrameAfterSwapOutACK) { TestRenderFrameHost* rfh2 = contents()->GetPendingMainFrame(); // The new page commits. - contents()->TestDidNavigate(rfh2, 1, kUrl2, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(rfh2, 1, kUrl2, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(rfh2, contents()->GetMainFrame()); EXPECT_TRUE(contents()->GetPendingMainFrame() == NULL); @@ -1621,7 +1624,8 @@ TEST_F(RenderFrameHostManagerTest, rfh1->GetSiteInstance())->increment_active_view_count(); // Navigate to new site, simulating onbeforeunload approval. - controller().LoadURL(kUrl2, Referrer(), PAGE_TRANSITION_LINK, std::string()); + controller().LoadURL( + kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); base::TimeTicks now = base::TimeTicks::Now(); rfh1->OnMessageReceived( FrameHostMsg_BeforeUnload_ACK(0, true, now, now)); @@ -1629,7 +1633,7 @@ TEST_F(RenderFrameHostManagerTest, TestRenderFrameHost* rfh2 = contents()->GetPendingMainFrame(); // The new page commits. - contents()->TestDidNavigate(rfh2, 1, kUrl2, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(rfh2, 1, kUrl2, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(rfh2, contents()->GetMainFrame()); EXPECT_TRUE(contents()->GetPendingMainFrame() == NULL); @@ -1661,7 +1665,8 @@ TEST_F(RenderFrameHostManagerTest, EXPECT_EQ(RenderViewHostImpl::STATE_DEFAULT, rvh1->rvh_state()); // Navigate to a new site, starting a cross-site navigation. - controller().LoadURL(kUrl2, Referrer(), PAGE_TRANSITION_LINK, std::string()); + controller().LoadURL( + kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); { pending_rfh = contents()->GetFrameTree()->root()->render_manager() ->pending_frame_host(); @@ -1678,7 +1683,8 @@ TEST_F(RenderFrameHostManagerTest, } // Start another cross-site navigation. - controller().LoadURL(kUrl2, Referrer(), PAGE_TRANSITION_LINK, std::string()); + controller().LoadURL( + kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); { pending_rfh = contents()->GetFrameTree()->root()->render_manager() ->pending_frame_host(); @@ -1750,7 +1756,7 @@ TEST_F(RenderFrameHostManagerTest, EnableBrowserSideNavigation(); EXPECT_FALSE(main_test_rfh()->render_view_host()->IsRenderViewLive()); contents()->GetController().LoadURL( - kUrl, Referrer(), PAGE_TRANSITION_LINK, std::string()); + kUrl, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); RenderFrameHostManager* render_manager = main_test_rfh()->frame_tree_node()->render_manager(); NavigationRequest* main_request = diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc index 6eb1532..4f7ae48 100644 --- a/content/browser/loader/cross_site_resource_handler.cc +++ b/content/browser/loader/cross_site_resource_handler.cc @@ -42,7 +42,7 @@ struct CrossSiteResponseParams { const GlobalRequestID& global_request_id, const std::vector<GURL>& transfer_url_chain, const Referrer& referrer, - PageTransition page_transition, + ui::PageTransition page_transition, bool should_replace_current_entry) : render_frame_id(render_frame_id), global_request_id(global_request_id), @@ -56,7 +56,7 @@ struct CrossSiteResponseParams { GlobalRequestID global_request_id; std::vector<GURL> transfer_url_chain; Referrer referrer; - PageTransition page_transition; + ui::PageTransition page_transition; bool should_replace_current_entry; }; diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index ebfce6c..7b09885 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -1336,7 +1336,7 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo( false, // parent_is_main_frame -1, // parent_render_frame_id RESOURCE_TYPE_SUB_RESOURCE, - PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false, // should_replace_current_entry download, // is_download false, // is_stream diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc index 4912829..d985014 100644 --- a/content/browser/loader/resource_dispatcher_host_unittest.cc +++ b/content/browser/loader/resource_dispatcher_host_unittest.cc @@ -142,7 +142,7 @@ static ResourceHostMsg_Request CreateResourceRequest(const char* method, request.is_main_frame = true; request.parent_is_main_frame = false; request.parent_render_frame_id = -1; - request.transition_type = PAGE_TRANSITION_LINK; + request.transition_type = ui::PAGE_TRANSITION_LINK; request.allow_download = true; return request; } diff --git a/content/browser/loader/resource_request_info_impl.cc b/content/browser/loader/resource_request_info_impl.cc index 16a64bb..418f5b0 100644 --- a/content/browser/loader/resource_request_info_impl.cc +++ b/content/browser/loader/resource_request_info_impl.cc @@ -42,7 +42,7 @@ void ResourceRequestInfo::AllocateForTesting(net::URLRequest* request, false, // parent_is_main_frame 0, // parent_render_frame_id resource_type, // resource_type - PAGE_TRANSITION_LINK, // transition_type + ui::PAGE_TRANSITION_LINK, // transition_type false, // should_replace_current_entry false, // is_download false, // is_stream @@ -97,7 +97,7 @@ ResourceRequestInfoImpl::ResourceRequestInfoImpl( bool parent_is_main_frame, int parent_render_frame_id, ResourceType resource_type, - PageTransition transition_type, + ui::PageTransition transition_type, bool should_replace_current_entry, bool is_download, bool is_stream, @@ -193,7 +193,7 @@ ResourceRequestInfoImpl::GetVisibilityState() const { return visibility_state_; } -PageTransition ResourceRequestInfoImpl::GetPageTransition() const { +ui::PageTransition ResourceRequestInfoImpl::GetPageTransition() const { return transition_type_; } diff --git a/content/browser/loader/resource_request_info_impl.h b/content/browser/loader/resource_request_info_impl.h index 54dd85d..23279c8 100644 --- a/content/browser/loader/resource_request_info_impl.h +++ b/content/browser/loader/resource_request_info_impl.h @@ -50,7 +50,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, bool parent_is_main_frame, int parent_render_frame_id, ResourceType resource_type, - PageTransition transition_type, + ui::PageTransition transition_type, bool should_replace_current_entry, bool is_download, bool is_stream, @@ -78,7 +78,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, virtual int GetProcessType() const OVERRIDE; virtual blink::WebReferrerPolicy GetReferrerPolicy() const OVERRIDE; virtual blink::WebPageVisibilityState GetVisibilityState() const OVERRIDE; - virtual PageTransition GetPageTransition() const OVERRIDE; + virtual ui::PageTransition GetPageTransition() const OVERRIDE; virtual bool HasUserGesture() const OVERRIDE; virtual bool WasIgnoredByHandler() const OVERRIDE; virtual bool GetAssociatedRenderFrame(int* render_process_id, @@ -181,7 +181,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, bool enable_load_timing_; bool was_ignored_by_handler_; ResourceType resource_type_; - PageTransition transition_type_; + ui::PageTransition transition_type_; int memory_cost_; blink::WebReferrerPolicy referrer_policy_; blink::WebPageVisibilityState visibility_state_; diff --git a/content/browser/loader/resource_scheduler_filter.cc b/content/browser/loader/resource_scheduler_filter.cc index 3732c6a..b9f240d 100644 --- a/content/browser/loader/resource_scheduler_filter.cc +++ b/content/browser/loader/resource_scheduler_filter.cc @@ -8,7 +8,7 @@ #include "content/browser/loader/resource_scheduler.h" #include "content/common/frame_messages.h" #include "content/common/view_messages.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" namespace content { namespace { @@ -43,7 +43,7 @@ bool ResourceSchedulerFilter::OnMessageReceived(const IPC::Message& message) { &message, &iter, ¶ms)) { break; } - if (PageTransitionIsMainFrame(params.transition) && + if (ui::PageTransitionIsMainFrame(params.transition) && !params.was_within_same_page) { // We need to track the RenderViewHost routing_id because of downstream // dependencies (crbug.com/392171 DownloadRequestHandle, diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc index efb87b6..a7baed1 100644 --- a/content/browser/loader/resource_scheduler_unittest.cc +++ b/content/browser/loader/resource_scheduler_unittest.cc @@ -178,7 +178,7 @@ class ResourceSchedulerTest : public testing::Test { false, // parent_is_main_frame 0, // parent_render_frame_id RESOURCE_TYPE_SUB_RESOURCE, // resource_type - PAGE_TRANSITION_LINK, // transition_type + ui::PAGE_TRANSITION_LINK, // transition_type false, // should_replace_current_entry false, // is_download false, // is_stream diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h index 8c453a3..dfc46f18 100644 --- a/content/browser/renderer_host/render_view_host_delegate.h +++ b/content/browser/renderer_host/render_view_host_delegate.h @@ -13,7 +13,6 @@ #include "base/strings/string16.h" #include "content/browser/dom_storage/session_storage_namespace_impl.h" #include "content/common/content_export.h" -#include "content/public/common/page_transition_types.h" #include "net/base/load_states.h" #include "third_party/WebKit/public/web/WebPopupType.h" #include "ui/base/window_open_disposition.h" diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 927942b..b2cd8a8 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -15,7 +15,6 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/drop_data.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/url_constants.h" #include "content/public/test/mock_render_process_host.h" #include "content/test/test_content_browser_client.h" @@ -23,6 +22,7 @@ #include "content/test/test_web_contents.h" #include "net/base/filename_util.h" #include "third_party/WebKit/public/web/WebDragOperation.h" +#include "ui/base/page_transition_types.h" namespace content { @@ -96,7 +96,7 @@ TEST_F(RenderViewHostTest, ResetUnloadOnReload) { NavigateAndCommit(url1); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_LINK, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); // Simulate the ClosePage call which is normally sent by the net::URLRequest. rvh()->ClosePage(); // Needed so that navigations are not suspended on the RVH. diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc index e2d3ec1..e74767d 100644 --- a/content/browser/service_worker/service_worker_url_request_job.cc +++ b/content/browser/service_worker/service_worker_url_request_job.cc @@ -18,7 +18,6 @@ #include "content/common/service_worker/service_worker_types.h" #include "content/public/browser/blob_handle.h" #include "content/public/browser/resource_request_info.h" -#include "content/public/common/page_transition_types.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" @@ -26,6 +25,7 @@ #include "storage/browser/blob/blob_data_handle.h" #include "storage/browser/blob/blob_storage_context.h" #include "storage/browser/blob/blob_url_request_job_factory.h" +#include "ui/base/page_transition_types.h" namespace content { @@ -274,8 +274,8 @@ ServiceWorkerURLRequestJob::CreateFetchRequest() { request->referrer = GURL(request_->referrer()); const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_); if (info) { - request->is_reload = PageTransitionCoreTypeIs(info->GetPageTransition(), - PAGE_TRANSITION_RELOAD); + request->is_reload = ui::PageTransitionCoreTypeIs( + info->GetPageTransition(), ui::PAGE_TRANSITION_RELOAD); } return request.Pass(); } diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc index ce02db9..714f76a 100644 --- a/content/browser/site_instance_impl_unittest.cc +++ b/content/browser/site_instance_impl_unittest.cc @@ -204,7 +204,7 @@ TEST_F(SiteInstanceTest, SiteInstanceDestructor) { EXPECT_EQ(0, site_delete_counter); NavigationEntryImpl* e1 = new NavigationEntryImpl( - instance, 0, url, Referrer(), base::string16(), PAGE_TRANSITION_LINK, + instance, 0, url, Referrer(), base::string16(), ui::PAGE_TRANSITION_LINK, false); // Redundantly setting e1's SiteInstance shouldn't affect the ref count. @@ -213,7 +213,7 @@ TEST_F(SiteInstanceTest, SiteInstanceDestructor) { // Add a second reference NavigationEntryImpl* e2 = new NavigationEntryImpl( - instance, 0, url, Referrer(), base::string16(), PAGE_TRANSITION_LINK, + instance, 0, url, Referrer(), base::string16(), ui::PAGE_TRANSITION_LINK, false); // Now delete both entries and be sure the SiteInstance goes away. @@ -266,7 +266,7 @@ TEST_F(SiteInstanceTest, CloneNavigationEntry) { &browsing_delete_counter); NavigationEntryImpl* e1 = new NavigationEntryImpl( - instance1, 0, url, Referrer(), base::string16(), PAGE_TRANSITION_LINK, + instance1, 0, url, Referrer(), base::string16(), ui::PAGE_TRANSITION_LINK, false); // Clone the entry NavigationEntryImpl* e2 = new NavigationEntryImpl(*e1); diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index a9ee346..f900e586 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc @@ -53,7 +53,7 @@ class SitePerProcessWebContentsObserver: public WebContentsObserver { virtual void DidCommitProvisionalLoadForFrame( RenderFrameHost* render_frame_host, const GURL& url, - PageTransition transition_type) OVERRIDE { + ui::PageTransition transition_type) OVERRIDE { navigation_url_ = url; navigation_succeeded_ = true; } diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index a9ddf1e..14cf8a4 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -1585,7 +1585,7 @@ void WebContentsImpl::CreateNewWindow( OpenURLParams open_params(params.target_url, Referrer(), CURRENT_TAB, - PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, true /* is_renderer_initiated */); open_params.user_gesture = params.user_gesture; new_contents->OpenURL(open_params); @@ -2574,7 +2574,7 @@ void WebContentsImpl::DidRedirectProvisionalLoad( void WebContentsImpl::DidCommitProvisionalLoad( RenderFrameHostImpl* render_frame_host, const GURL& url, - PageTransition transition_type) { + ui::PageTransition transition_type) { // Notify observers about the commit of the provisional load. FOR_EACH_OBSERVER(WebContentsObserver, observers_, diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index dd998c6..134b8d8 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -31,13 +31,13 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/renderer_preferences.h" #include "content/public/common/resource_type.h" #include "content/public/common/three_d_api_types.h" #include "net/base/load_states.h" #include "net/http/http_response_headers.h" #include "third_party/WebKit/public/web/WebDragOperation.h" +#include "ui/base/page_transition_types.h" #include "ui/gfx/rect_f.h" #include "ui/gfx/size.h" @@ -508,7 +508,7 @@ class CONTENT_EXPORT WebContentsImpl virtual void DidCommitProvisionalLoad( RenderFrameHostImpl* render_frame_host, const GURL& url, - PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; virtual void DidNavigateMainFramePreCommit( bool navigation_is_within_page) OVERRIDE; virtual void DidNavigateMainFramePostCommit( diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc index ecbb896..f3441a2 100644 --- a/content/browser/web_contents/web_contents_impl_browsertest.cc +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc @@ -352,7 +352,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, OpenURLSubframe) { // Navigate with the subframe's FrameTreeNode ID. const GURL url(test_server()->GetURL("files/title1.html")); OpenURLParams params(url, Referrer(), frame_tree_node_id, CURRENT_TAB, - PAGE_TRANSITION_LINK, true); + ui::PAGE_TRANSITION_LINK, true); shell()->web_contents()->OpenURL(params); // Make sure the NavigationEntry ends up with the FrameTreeNode ID. diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc index 46c9168..a9ce61d 100644 --- a/content/browser/web_contents/web_contents_impl_unittest.cc +++ b/content/browser/web_contents/web_contents_impl_unittest.cc @@ -157,7 +157,7 @@ class TestInterstitialPage : public InterstitialPageImpl { void TestDidNavigate(int page_id, const GURL& url) { FrameHostMsg_DidCommitProvisionalLoad_Params params; - InitNavigateParams(¶ms, page_id, url, PAGE_TRANSITION_TYPED); + InitNavigateParams(¶ms, page_id, url, ui::PAGE_TRANSITION_TYPED); DidNavigate(GetRenderViewHostForTesting(), params); } @@ -344,7 +344,7 @@ TEST_F(WebContentsImplTest, UpdateTitle) { static_cast<NavigationControllerImpl&>(controller()); FrameHostMsg_DidCommitProvisionalLoad_Params params; InitNavigateParams( - ¶ms, 0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); + ¶ms, 0, GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_TYPED); LoadCommittedDetails details; cont.RendererDidNavigate(contents()->GetMainFrame(), params, &details); @@ -358,7 +358,7 @@ TEST_F(WebContentsImplTest, UpdateTitle) { TEST_F(WebContentsImplTest, DontUseTitleFromPendingEntry) { const GURL kGURL("chrome://blah"); controller().LoadURL( - kGURL, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kGURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_EQ(base::string16(), contents()->GetTitle()); } @@ -366,7 +366,7 @@ TEST_F(WebContentsImplTest, UseTitleFromPendingEntryIfSet) { const GURL kGURL("chrome://blah"); const base::string16 title = base::ASCIIToUTF16("My Title"); controller().LoadURL( - kGURL, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kGURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); NavigationEntry* entry = controller().GetVisibleEntry(); ASSERT_EQ(kGURL, entry->GetURL()); @@ -385,14 +385,14 @@ TEST_F(WebContentsImplTest, NTPViewSource) { process()->sink().ClearMessages(); cont.LoadURL( - kGURL, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kGURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); rvh()->GetDelegate()->RenderViewCreated(rvh()); // Did we get the expected message? EXPECT_TRUE(process()->sink().GetFirstMessageMatching( ViewMsg_EnableViewSourceMode::ID)); FrameHostMsg_DidCommitProvisionalLoad_Params params; - InitNavigateParams(¶ms, 0, kGURL, PAGE_TRANSITION_TYPED); + InitNavigateParams(¶ms, 0, kGURL, ui::PAGE_TRANSITION_TYPED); LoadCommittedDetails details; cont.RendererDidNavigate(contents()->GetMainFrame(), params, &details); // Also check title and url. @@ -431,7 +431,7 @@ TEST_F(WebContentsImplTest, SimpleNavigation) { // Navigate to URL const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(instance1, orig_rfh->GetSiteInstance()); // Controller's pending entry will have a NULL site instance until we assign @@ -441,7 +441,7 @@ TEST_F(WebContentsImplTest, SimpleNavigation) { site_instance() == NULL); // DidNavigate from the page - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); EXPECT_EQ(instance1, orig_rfh->GetSiteInstance()); @@ -460,7 +460,7 @@ TEST_F(WebContentsImplTest, NavigateToExcessivelyLongURL) { GetMaxURLChars() + 1, 'a')); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_GENERATED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_GENERATED, std::string()); EXPECT_TRUE(controller().GetVisibleEntry() == NULL); } @@ -475,8 +475,8 @@ TEST_F(WebContentsImplTest, CrossSiteBoundaries) { // Navigate to URL. First URL should use first RenderViewHost. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); // Keep the number of active views in orig_rfh's SiteInstance non-zero so that // orig_rfh doesn't get deleted when it gets swapped out. @@ -490,7 +490,8 @@ TEST_F(WebContentsImplTest, CrossSiteBoundaries) { // Navigate to new site const GURL url2("http://www.yahoo.com"); - controller().LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller().LoadURL( + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(contents()->cross_navigation_pending()); EXPECT_EQ(url, contents()->GetLastCommittedURL()); EXPECT_EQ(url2, contents()->GetVisibleURL()); @@ -506,7 +507,7 @@ TEST_F(WebContentsImplTest, CrossSiteBoundaries) { // DidNavigate from the pending page contents()->TestDidNavigate( - pending_rfh, 1, url2, PAGE_TRANSITION_TYPED); + pending_rfh, 1, url2, ui::PAGE_TRANSITION_TYPED); SiteInstance* instance2 = contents()->GetSiteInstance(); // Keep the number of active views in pending_rfh's SiteInstance @@ -540,7 +541,7 @@ TEST_F(WebContentsImplTest, CrossSiteBoundaries) { EXPECT_FALSE(goback_rfh->are_navigations_suspended()); // DidNavigate from the back action - contents()->TestDidNavigate(goback_rfh, 1, url2, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(goback_rfh, 1, url2, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(goback_rfh, contents()->GetMainFrame()); EXPECT_EQ(instance1, contents()->GetSiteInstance()); @@ -568,8 +569,8 @@ TEST_F(WebContentsImplTest, CrossSiteBoundariesAfterCrash) { // Navigate to URL. First URL should use first RenderViewHost. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(orig_rfh->GetRenderViewHost(), contents()->GetRenderViewHost()); @@ -581,7 +582,7 @@ TEST_F(WebContentsImplTest, CrossSiteBoundariesAfterCrash) { // Navigate to new site. We should not go into PENDING. const GURL url2("http://www.yahoo.com"); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); TestRenderFrameHost* new_rfh = contents()->GetMainFrame(); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_TRUE(contents()->GetPendingMainFrame() == NULL); @@ -589,7 +590,7 @@ TEST_F(WebContentsImplTest, CrossSiteBoundariesAfterCrash) { EXPECT_EQ(orig_rvh_delete_count, 1); // DidNavigate from the new page - contents()->TestDidNavigate(new_rfh, 1, url2, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(new_rfh, 1, url2, ui::PAGE_TRANSITION_TYPED); SiteInstance* instance2 = contents()->GetSiteInstance(); EXPECT_FALSE(contents()->cross_navigation_pending()); @@ -612,35 +613,35 @@ TEST_F(WebContentsImplTest, NavigateTwoTabsCrossSite) { // Navigate to URL. First URL should use first RenderViewHost. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); // Open a new contents with the same SiteInstance, navigated to the same site. scoped_ptr<TestWebContents> contents2( TestWebContents::Create(browser_context(), instance1)); contents2->GetController().LoadURL(url, Referrer(), - PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, std::string()); // Need this page id to be 2 since the site instance is the same (which is the // scope of page IDs) and we want to consider this a new page. contents2->TestDidNavigate( - contents2->GetMainFrame(), 2, url, PAGE_TRANSITION_TYPED); + contents2->GetMainFrame(), 2, url, ui::PAGE_TRANSITION_TYPED); // Navigate first contents to a new site. const GURL url2a("http://www.yahoo.com"); controller().LoadURL( - url2a, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2a, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); orig_rfh->GetRenderViewHost()->SendBeforeUnloadACK(true); TestRenderFrameHost* pending_rfh_a = contents()->GetPendingMainFrame(); contents()->TestDidNavigate( - pending_rfh_a, 1, url2a, PAGE_TRANSITION_TYPED); + pending_rfh_a, 1, url2a, ui::PAGE_TRANSITION_TYPED); SiteInstance* instance2a = contents()->GetSiteInstance(); EXPECT_NE(instance1, instance2a); // Navigate second contents to the same site as the first tab. const GURL url2b("http://mail.yahoo.com"); contents2->GetController().LoadURL(url2b, Referrer(), - PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, std::string()); TestRenderFrameHost* rfh2 = contents2->GetMainFrame(); rfh2->GetRenderViewHost()->SendBeforeUnloadACK(true); @@ -651,7 +652,8 @@ TEST_F(WebContentsImplTest, NavigateTwoTabsCrossSite) { // NOTE(creis): We used to be in danger of showing a crash page here if the // second contents hadn't navigated somewhere first (bug 1145430). That case // is now covered by the CrossSiteBoundariesAfterCrash test. - contents2->TestDidNavigate(pending_rfh_b, 2, url2b, PAGE_TRANSITION_TYPED); + contents2->TestDidNavigate( + pending_rfh_b, 2, url2b, ui::PAGE_TRANSITION_TYPED); SiteInstance* instance2b = contents2->GetSiteInstance(); EXPECT_NE(instance1, instance2b); @@ -677,8 +679,9 @@ TEST_F(WebContentsImplTest, NavigateFromSitelessUrl) { // Navigate to an URL that will not assign a new SiteInstance. const GURL native_url("non-site-url://stuffandthings"); controller().LoadURL( - native_url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, native_url, PAGE_TRANSITION_TYPED); + native_url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate( + orig_rfh, 1, native_url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); @@ -692,12 +695,12 @@ TEST_F(WebContentsImplTest, NavigateFromSitelessUrl) { // Navigate to new site (should keep same site instance). const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(native_url, contents()->GetLastCommittedURL()); EXPECT_EQ(url, contents()->GetVisibleURL()); EXPECT_FALSE(contents()->GetPendingMainFrame()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); // Keep the number of active views in orig_rfh's SiteInstance // non-zero so that orig_rfh doesn't get deleted when it gets @@ -713,7 +716,7 @@ TEST_F(WebContentsImplTest, NavigateFromSitelessUrl) { // Navigate to another new site (should create a new site instance). const GURL url2("http://www.yahoo.com"); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(contents()->cross_navigation_pending()); EXPECT_EQ(url, contents()->GetLastCommittedURL()); EXPECT_EQ(url2, contents()->GetVisibleURL()); @@ -729,7 +732,7 @@ TEST_F(WebContentsImplTest, NavigateFromSitelessUrl) { // DidNavigate from the pending page. contents()->TestDidNavigate( - pending_rfh, 1, url2, PAGE_TRANSITION_TYPED); + pending_rfh, 1, url2, ui::PAGE_TRANSITION_TYPED); SiteInstance* new_instance = contents()->GetSiteInstance(); EXPECT_FALSE(contents()->cross_navigation_pending()); @@ -766,7 +769,7 @@ TEST_F(WebContentsImplTest, NavigateFromRestoredSitelessUrl) { const GURL native_url("non-site-url://stuffandthings"); std::vector<NavigationEntry*> entries; NavigationEntry* entry = NavigationControllerImpl::CreateNavigationEntry( - native_url, Referrer(), PAGE_TRANSITION_LINK, false, std::string(), + native_url, Referrer(), ui::PAGE_TRANSITION_LINK, false, std::string(), browser_context()); entry->SetPageID(0); entries.push_back(entry); @@ -777,7 +780,8 @@ TEST_F(WebContentsImplTest, NavigateFromRestoredSitelessUrl) { ASSERT_EQ(0u, entries.size()); ASSERT_EQ(1, controller().GetEntryCount()); controller().GoToIndex(0); - contents()->TestDidNavigate(orig_rfh, 0, native_url, PAGE_TRANSITION_RELOAD); + contents()->TestDidNavigate( + orig_rfh, 0, native_url, ui::PAGE_TRANSITION_RELOAD); EXPECT_EQ(orig_instance, contents()->GetSiteInstance()); EXPECT_EQ(GURL(), contents()->GetSiteInstance()->GetSiteURL()); EXPECT_FALSE(orig_instance->HasSite()); @@ -786,8 +790,8 @@ TEST_F(WebContentsImplTest, NavigateFromRestoredSitelessUrl) { browser_client.set_assign_site_for_url(true); const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 2, url, PAGE_TRANSITION_TYPED); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 2, url, ui::PAGE_TRANSITION_TYPED); EXPECT_EQ(orig_instance, contents()->GetSiteInstance()); // Cleanup. @@ -809,7 +813,7 @@ TEST_F(WebContentsImplTest, NavigateFromRestoredRegularUrl) { const GURL regular_url("http://www.yahoo.com"); std::vector<NavigationEntry*> entries; NavigationEntry* entry = NavigationControllerImpl::CreateNavigationEntry( - regular_url, Referrer(), PAGE_TRANSITION_LINK, false, std::string(), + regular_url, Referrer(), ui::PAGE_TRANSITION_LINK, false, std::string(), browser_context()); entry->SetPageID(0); entries.push_back(entry); @@ -820,16 +824,17 @@ TEST_F(WebContentsImplTest, NavigateFromRestoredRegularUrl) { ASSERT_EQ(0u, entries.size()); ASSERT_EQ(1, controller().GetEntryCount()); controller().GoToIndex(0); - contents()->TestDidNavigate(orig_rfh, 0, regular_url, PAGE_TRANSITION_RELOAD); + contents()->TestDidNavigate( + orig_rfh, 0, regular_url, ui::PAGE_TRANSITION_RELOAD); EXPECT_EQ(orig_instance, contents()->GetSiteInstance()); EXPECT_TRUE(orig_instance->HasSite()); // Navigate to another site and verify that a new SiteInstance was created. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); contents()->TestDidNavigate( - contents()->GetPendingMainFrame(), 2, url, PAGE_TRANSITION_TYPED); + contents()->GetPendingMainFrame(), 2, url, ui::PAGE_TRANSITION_TYPED); EXPECT_NE(orig_instance, contents()->GetSiteInstance()); // Cleanup. @@ -844,13 +849,13 @@ TEST_F(WebContentsImplTest, FindOpenerRVHWhenPending) { // Navigate to a URL. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); // Start to navigate first tab to a new site, so that it has a pending RVH. const GURL url2("http://www.yahoo.com"); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); orig_rfh->GetRenderViewHost()->SendBeforeUnloadACK(true); TestRenderFrameHost* pending_rfh = contents()->GetPendingMainFrame(); @@ -874,22 +879,22 @@ TEST_F(WebContentsImplTest, CrossSiteComparesAgainstCurrentPage) { // Navigate to URL. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); contents()->TestDidNavigate( - orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); // Open a related contents to a second site. scoped_ptr<TestWebContents> contents2( TestWebContents::Create(browser_context(), instance1)); const GURL url2("http://www.yahoo.com"); contents2->GetController().LoadURL(url2, Referrer(), - PAGE_TRANSITION_TYPED, + ui::PAGE_TRANSITION_TYPED, std::string()); // The first RVH in contents2 isn't live yet, so we shortcut the cross site // pending. TestRenderFrameHost* rfh2 = contents2->GetMainFrame(); EXPECT_FALSE(contents2->cross_navigation_pending()); - contents2->TestDidNavigate(rfh2, 2, url2, PAGE_TRANSITION_TYPED); + contents2->TestDidNavigate(rfh2, 2, url2, ui::PAGE_TRANSITION_TYPED); SiteInstance* instance2 = contents2->GetSiteInstance(); EXPECT_NE(instance1, instance2); EXPECT_FALSE(contents2->cross_navigation_pending()); @@ -897,7 +902,7 @@ TEST_F(WebContentsImplTest, CrossSiteComparesAgainstCurrentPage) { // Simulate a link click in first contents to second site. Doesn't switch // SiteInstances, because we don't intercept WebKit navigations. contents()->TestDidNavigate( - orig_rfh, 2, url2, PAGE_TRANSITION_TYPED); + orig_rfh, 2, url2, ui::PAGE_TRANSITION_TYPED); SiteInstance* instance3 = contents()->GetSiteInstance(); EXPECT_EQ(instance1, instance3); EXPECT_FALSE(contents()->cross_navigation_pending()); @@ -906,10 +911,10 @@ TEST_F(WebContentsImplTest, CrossSiteComparesAgainstCurrentPage) { // compare against the current URL, not the SiteInstance's site. const GURL url3("http://mail.yahoo.com"); controller().LoadURL( - url3, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url3, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_FALSE(contents()->cross_navigation_pending()); contents()->TestDidNavigate( - orig_rfh, 3, url3, PAGE_TRANSITION_TYPED); + orig_rfh, 3, url3, ui::PAGE_TRANSITION_TYPED); SiteInstance* instance4 = contents()->GetSiteInstance(); EXPECT_EQ(instance1, instance4); } @@ -923,15 +928,15 @@ TEST_F(WebContentsImplTest, CrossSiteUnloadHandlers) { // Navigate to URL. First URL should use first RenderViewHost. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); // Navigate to new site, but simulate an onbeforeunload denial. const GURL url2("http://www.yahoo.com"); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(orig_rfh->GetRenderViewHost()->is_waiting_for_beforeunload_ack()); base::TimeTicks now = base::TimeTicks::Now(); orig_rfh->OnMessageReceived( @@ -943,7 +948,7 @@ TEST_F(WebContentsImplTest, CrossSiteUnloadHandlers) { // Navigate again, but simulate an onbeforeunload approval. controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(orig_rfh->GetRenderViewHost()->is_waiting_for_beforeunload_ack()); now = base::TimeTicks::Now(); orig_rfh->OnMessageReceived( @@ -957,7 +962,7 @@ TEST_F(WebContentsImplTest, CrossSiteUnloadHandlers) { // DidNavigate from the pending page. contents()->TestDidNavigate( - pending_rfh, 1, url2, PAGE_TRANSITION_TYPED); + pending_rfh, 1, url2, ui::PAGE_TRANSITION_TYPED); SiteInstance* instance2 = contents()->GetSiteInstance(); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(pending_rfh, contents()->GetMainFrame()); @@ -975,15 +980,15 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationPreempted) { // Navigate to URL. First URL should use first RenderFrameHost. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); // Navigate to new site, simulating an onbeforeunload approval. const GURL url2("http://www.yahoo.com"); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(orig_rfh->GetRenderViewHost()->is_waiting_for_beforeunload_ack()); base::TimeTicks now = base::TimeTicks::Now(); orig_rfh->OnMessageReceived(FrameHostMsg_BeforeUnload_ACK(0, true, now, now)); @@ -1006,9 +1011,9 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationBackPreempted) { // Start with a web ui page, which gets a new RVH with WebUI bindings. const GURL url1("chrome://blah"); controller().LoadURL( - url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); TestRenderFrameHost* ntp_rfh = contents()->GetMainFrame(); - contents()->TestDidNavigate(ntp_rfh, 1, url1, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(ntp_rfh, 1, url1, ui::PAGE_TRANSITION_TYPED); NavigationEntry* entry1 = controller().GetLastCommittedEntry(); SiteInstance* instance1 = contents()->GetSiteInstance(); @@ -1023,7 +1028,7 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationBackPreempted) { // Navigate to new site. const GURL url2("http://www.google.com"); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(contents()->cross_navigation_pending()); TestRenderFrameHost* google_rfh = contents()->GetPendingMainFrame(); @@ -1035,7 +1040,7 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationBackPreempted) { // DidNavigate from the pending page. contents()->TestDidNavigate( - google_rfh, 1, url2, PAGE_TRANSITION_TYPED); + google_rfh, 1, url2, ui::PAGE_TRANSITION_TYPED); NavigationEntry* entry2 = controller().GetLastCommittedEntry(); SiteInstance* instance2 = contents()->GetSiteInstance(); @@ -1052,10 +1057,10 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationBackPreempted) { // Navigate to third page on same site. const GURL url3("http://news.google.com"); controller().LoadURL( - url3, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url3, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_FALSE(contents()->cross_navigation_pending()); contents()->TestDidNavigate( - google_rfh, 2, url3, PAGE_TRANSITION_TYPED); + google_rfh, 2, url3, ui::PAGE_TRANSITION_TYPED); NavigationEntry* entry3 = controller().GetLastCommittedEntry(); SiteInstance* instance3 = contents()->GetSiteInstance(); @@ -1086,7 +1091,7 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationBackPreempted) { FrameHostMsg_BeforeUnload_ACK(0, true, now, now)); // DidNavigate from the first back. This aborts the second back's pending RFH. - contents()->TestDidNavigate(google_rfh, 1, url2, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(google_rfh, 1, url2, ui::PAGE_TRANSITION_TYPED); // We should commit this page and forget about the second back. EXPECT_FALSE(contents()->cross_navigation_pending()); @@ -1112,21 +1117,21 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationNotPreemptedByFrame) { // Navigate to URL. First URL should use the original RenderFrameHost. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); // Start navigating to new site. const GURL url2("http://www.yahoo.com"); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate a sub-frame navigation arriving and ensure the RVH is still // waiting for a before unload response. TestRenderFrameHost* child_rfh = orig_rfh->AppendChild("subframe"); child_rfh->SendNavigateWithTransition( - 1, GURL("http://google.com/frame"), PAGE_TRANSITION_AUTO_SUBFRAME); + 1, GURL("http://google.com/frame"), ui::PAGE_TRANSITION_AUTO_SUBFRAME); EXPECT_TRUE(orig_rfh->GetRenderViewHost()->is_waiting_for_beforeunload_ack()); // Now simulate the onbeforeunload approval and verify the navigation is @@ -1147,14 +1152,14 @@ TEST_F(WebContentsImplTest, CrossSiteNotPreemptedDuringBeforeUnload) { // Navigate to NTP URL. const GURL url("chrome://blah"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); TestRenderFrameHost* orig_rfh = contents()->GetMainFrame(); EXPECT_FALSE(contents()->cross_navigation_pending()); // Navigate to new site, with the beforeunload request in flight. const GURL url2("http://www.yahoo.com"); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); TestRenderFrameHost* pending_rfh = contents()->GetPendingMainFrame(); EXPECT_TRUE(contents()->cross_navigation_pending()); EXPECT_TRUE(orig_rfh->GetRenderViewHost()->is_waiting_for_beforeunload_ack()); @@ -1169,7 +1174,7 @@ TEST_F(WebContentsImplTest, CrossSiteNotPreemptedDuringBeforeUnload) { orig_rfh->GetRenderViewHost()->is_waiting_for_beforeunload_ack()); // The pending navigation should be able to commit successfully. - contents()->TestDidNavigate(pending_rfh, 1, url2, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(pending_rfh, 1, url2, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(pending_rfh, contents()->GetMainFrame()); } @@ -1183,14 +1188,15 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationCanceled) { // Navigate to URL. First URL should use original RenderFrameHost. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); // Navigate to new site, simulating an onbeforeunload approval. const GURL url2("http://www.yahoo.com"); - controller().LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller().LoadURL( + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(orig_rfh->GetRenderViewHost()->is_waiting_for_beforeunload_ack()); base::TimeTicks now = base::TimeTicks::Now(); orig_rfh->OnMessageReceived( @@ -1202,7 +1208,8 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationCanceled) { // Suppose the navigation doesn't get a chance to commit, and the user // navigates in the current RFH's SiteInstance. - controller().LoadURL(url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller().LoadURL( + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Verify that the pending navigation is cancelled and the renderer is no // longer swapped out. @@ -1224,29 +1231,31 @@ TEST_F(WebContentsImplTest, NavigationEntryContentState) { // Navigate to URL. There should be no committed entry yet. const GURL url("http://www.google.com"); - controller().LoadURL(url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller().LoadURL( + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); NavigationEntry* entry = controller().GetLastCommittedEntry(); EXPECT_TRUE(entry == NULL); // Committed entry should have page state after DidNavigate. - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); entry = controller().GetLastCommittedEntry(); EXPECT_TRUE(entry->GetPageState().IsValid()); // Navigate to same site. const GURL url2("http://images.google.com"); - controller().LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller().LoadURL( + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); entry = controller().GetLastCommittedEntry(); EXPECT_TRUE(entry->GetPageState().IsValid()); // Committed entry should have page state after DidNavigate. - contents()->TestDidNavigate(orig_rfh, 2, url2, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(orig_rfh, 2, url2, ui::PAGE_TRANSITION_TYPED); entry = controller().GetLastCommittedEntry(); EXPECT_TRUE(entry->GetPageState().IsValid()); // Now go back. Committed entry should still have page state. controller().GoBack(); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); entry = controller().GetLastCommittedEntry(); EXPECT_TRUE(entry->GetPageState().IsValid()); } @@ -1260,8 +1269,8 @@ TEST_F(WebContentsImplTest, NavigationEntryContentStateNewWindow) { // When opening a new window, it is navigated to about:blank internally. // Currently, this results in two DidNavigate events. const GURL url(url::kAboutBlankURL); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); // Should have a page state here. NavigationEntry* entry = controller().GetLastCommittedEntry(); @@ -1276,10 +1285,10 @@ TEST_F(WebContentsImplTest, NavigationEntryContentStateNewWindow) { // Navigating to a normal page should not cause a process swap. const GURL new_url("http://www.google.com"); controller().LoadURL(new_url, Referrer(), - PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); - contents()->TestDidNavigate(orig_rfh, 1, new_url, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(orig_rfh, 1, new_url, ui::PAGE_TRANSITION_TYPED); NavigationEntryImpl* entry_impl2 = NavigationEntryImpl::FromNavigationEntry( controller().GetLastCommittedEntry()); EXPECT_EQ(site_instance_id, entry_impl2->site_instance()->GetId()); @@ -1297,8 +1306,8 @@ TEST_F(WebContentsImplTest, NavigationExitsFullscreen) { // Navigate to a site. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); // Toggle fullscreen mode on (as if initiated via IPC from renderer). @@ -1314,10 +1323,10 @@ TEST_F(WebContentsImplTest, NavigationExitsFullscreen) { // Navigate to a new site. const GURL url2("http://www.yahoo.com"); controller().LoadURL( - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); TestRenderFrameHost* const pending_rfh = contents()->GetPendingMainFrame(); contents()->TestDidNavigate( - pending_rfh, 1, url2, PAGE_TRANSITION_TYPED); + pending_rfh, 1, url2, ui::PAGE_TRANSITION_TYPED); // Confirm fullscreen has exited. EXPECT_FALSE(orig_rvh->IsFullscreen()); @@ -1337,15 +1346,17 @@ TEST_F(WebContentsImplTest, HistoryNavigationExitsFullscreen) { // Navigate to a site. const GURL url("http://www.google.com"); - controller().LoadURL(url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); - contents()->TestDidNavigate(orig_rfh, 1, url, PAGE_TRANSITION_TYPED); + controller().LoadURL( + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + contents()->TestDidNavigate(orig_rfh, 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); // Now, navigate to another page on the same site. const GURL url2("http://www.google.com/search?q=kittens"); - controller().LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller().LoadURL( + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_FALSE(contents()->cross_navigation_pending()); - contents()->TestDidNavigate(orig_rfh, 2, url2, PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(orig_rfh, 2, url2, ui::PAGE_TRANSITION_TYPED); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); // Sanity-check: Confirm we're not starting out in fullscreen mode. @@ -1369,7 +1380,7 @@ TEST_F(WebContentsImplTest, HistoryNavigationExitsFullscreen) { EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(orig_rfh, contents()->GetMainFrame()); contents()->TestDidNavigate( - orig_rfh, i + 1, url, PAGE_TRANSITION_FORWARD_BACK); + orig_rfh, i + 1, url, ui::PAGE_TRANSITION_FORWARD_BACK); // Confirm fullscreen has exited. EXPECT_FALSE(orig_rvh->IsFullscreen()); @@ -1405,9 +1416,9 @@ TEST_F(WebContentsImplTest, CrashExitsFullscreen) { // Navigate to a site. const GURL url("http://www.google.com"); controller().LoadURL( - url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); contents()->TestDidNavigate( - contents()->GetMainFrame(), 1, url, PAGE_TRANSITION_TYPED); + contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED); // Toggle fullscreen mode on (as if initiated via IPC from renderer). EXPECT_FALSE(test_rvh()->IsFullscreen()); @@ -1448,7 +1459,7 @@ TEST_F(WebContentsImplTest, // Initiate a browser navigation that will trigger the interstitial controller().LoadURL(GURL("http://www.evil.com"), Referrer(), - PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Show an interstitial. TestInterstitialPage::InterstitialState state = @@ -1591,7 +1602,7 @@ TEST_F(WebContentsImplTest, // Initiate a browser navigation that will trigger the interstitial controller().LoadURL(GURL("http://www.evil.com"), Referrer(), - PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Show an interstitial. TestInterstitialPage::InterstitialState state = @@ -2086,7 +2097,8 @@ TEST_F(WebContentsImplTest, NavigateBeforeInterstitialShows) { // Let's simulate a navigation initiated from the browser before the // interstitial finishes loading. const GURL url("http://www.google.com"); - controller().LoadURL(url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + controller().LoadURL( + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); EXPECT_FALSE(interstitial->is_showing()); RunAllPendingInMessageLoop(); ASSERT_FALSE(deleted); @@ -2183,7 +2195,7 @@ TEST_F(WebContentsImplTest, NewInterstitialDoesNotCancelPendingEntry) { // Start a navigation to a page contents()->GetController().LoadURL( - kGURL, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kGURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // Simulate that navigation triggering an interstitial. TestInterstitialPage::InterstitialState state = @@ -2198,7 +2210,7 @@ TEST_F(WebContentsImplTest, NewInterstitialDoesNotCancelPendingEntry) { // Initiate a new navigation from the browser that also triggers an // interstitial. contents()->GetController().LoadURL( - kGURL, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kGURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); TestInterstitialPage::InterstitialState state2 = TestInterstitialPage::INVALID; bool deleted2 = false; @@ -2229,10 +2241,10 @@ TEST_F(WebContentsImplTest, NoJSMessageOnInterstitials) { // Start a navigation to a page contents()->GetController().LoadURL( - kGURL, Referrer(), PAGE_TRANSITION_TYPED, std::string()); + kGURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); // DidNavigate from the page contents()->TestDidNavigate( - contents()->GetMainFrame(), 1, kGURL, PAGE_TRANSITION_TYPED); + contents()->GetMainFrame(), 1, kGURL, ui::PAGE_TRANSITION_TYPED); // Simulate showing an interstitial while the page is showing. TestInterstitialPage::InterstitialState state = @@ -2264,7 +2276,7 @@ TEST_F(WebContentsImplTest, CopyStateFromAndPruneSourceInterstitial) { // Initiate a browser navigation that will trigger the interstitial controller().LoadURL(GURL("http://www.evil.com"), Referrer(), - PAGE_TRANSITION_TYPED, std::string()); + ui::PAGE_TRANSITION_TYPED, std::string()); // Show an interstitial. TestInterstitialPage::InterstitialState state = @@ -2624,22 +2636,28 @@ TEST_F(WebContentsImplTest, ActiveContentsCountNavigate) { EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); // Navigate to a URL. - contents->GetController().LoadURL( - GURL("http://a.com/1"), Referrer(), PAGE_TRANSITION_TYPED, std::string()); + contents->GetController().LoadURL(GURL("http://a.com/1"), + Referrer(), + ui::PAGE_TRANSITION_TYPED, + std::string()); EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); contents->CommitPendingNavigation(); EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); // Navigate to a URL in the same site. - contents->GetController().LoadURL( - GURL("http://a.com/2"), Referrer(), PAGE_TRANSITION_TYPED, std::string()); + contents->GetController().LoadURL(GURL("http://a.com/2"), + Referrer(), + ui::PAGE_TRANSITION_TYPED, + std::string()); EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); contents->CommitPendingNavigation(); EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); // Navigate to a URL in a different site. - contents->GetController().LoadURL( - GURL("http://b.com"), Referrer(), PAGE_TRANSITION_TYPED, std::string()); + contents->GetController().LoadURL(GURL("http://b.com"), + Referrer(), + ui::PAGE_TRANSITION_TYPED, + std::string()); EXPECT_TRUE(contents->cross_navigation_pending()); EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); contents->CommitPendingNavigation(); @@ -2666,8 +2684,10 @@ TEST_F(WebContentsImplTest, ActiveContentsCountChangeBrowsingInstance) { EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); // Navigate to a URL with WebUI. This will change BrowsingInstances. - contents->GetController().LoadURL( - GURL(kTestWebUIUrl), Referrer(), PAGE_TRANSITION_TYPED, std::string()); + contents->GetController().LoadURL(GURL(kTestWebUIUrl), + Referrer(), + ui::PAGE_TRANSITION_TYPED, + std::string()); EXPECT_TRUE(contents->cross_navigation_pending()); scoped_refptr<SiteInstance> instance_webui( contents->GetPendingMainFrame()->GetSiteInstance()); diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc index 0ac5a3c..e3ec9f5 100644 --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc @@ -639,11 +639,11 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, int transition; } navigations[] = { { https_server.GetURL("files/title1.html"), - PAGE_TRANSITION_TYPED | PAGE_TRANSITION_FROM_ADDRESS_BAR }, + ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR }, { test_server()->GetURL("files/title2.html"), - PAGE_TRANSITION_AUTO_BOOKMARK }, + ui::PAGE_TRANSITION_AUTO_BOOKMARK }, { https_server.GetURL("files/title3.html"), - PAGE_TRANSITION_TYPED | PAGE_TRANSITION_FROM_ADDRESS_BAR }, + ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR }, { GURL(), 0 } }; @@ -651,7 +651,8 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, for (int i = 0; !navigations[i].url.is_empty(); ++i) { // Navigate via the user initiating a navigation from the UI. NavigationController::LoadURLParams params(navigations[i].url); - params.transition_type = PageTransitionFromInt(navigations[i].transition); + params.transition_type = + ui::PageTransitionFromInt(navigations[i].transition); RenderViewHost* old_host = web_contents->GetRenderViewHost(); web_contents->GetController().LoadURLWithParams(params); @@ -679,7 +680,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, // Navigate again. This should not take any screenshot because of the // increased screenshot interval. NavigationController::LoadURLParams params(navigations[0].url); - params.transition_type = PageTransitionFromInt(navigations[0].transition); + params.transition_type = ui::PageTransitionFromInt(navigations[0].transition); web_contents->GetController().LoadURLWithParams(params); WaitForLoadStop(web_contents); screenshot_manager()->WaitUntilScreenshotIsReady(); diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm index b0cb8e2..0e57d4f 100644 --- a/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm @@ -216,7 +216,7 @@ int GetModifierFlags() { GURL url; ui::PopulateURLAndTitleFromPasteboard(&url, NULL, pboard, YES); webContents_->OpenURL(OpenURLParams( - url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK, + url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_AUTO_BOOKMARK, false)); return YES; } else { diff --git a/content/browser/webui/generic_handler.cc b/content/browser/webui/generic_handler.cc index 058382f..b26bcd9 100644 --- a/content/browser/webui/generic_handler.cc +++ b/content/browser/webui/generic_handler.cc @@ -50,8 +50,11 @@ void GenericHandler::HandleNavigateToUrl(const base::ListValue* args) { if (disposition == CURRENT_TAB && target_string == "_blank") disposition = NEW_FOREGROUND_TAB; - web_ui()->GetWebContents()->OpenURL(OpenURLParams( - GURL(url_string), Referrer(), disposition, PAGE_TRANSITION_LINK, false)); + web_ui()->GetWebContents()->OpenURL(OpenURLParams(GURL(url_string), + Referrer(), + disposition, + ui::PAGE_TRANSITION_LINK, + false)); // This may delete us! } diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc index 340a047..a9194a9 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc @@ -44,7 +44,7 @@ base::string16 WebUI::GetJavascriptCall( } WebUIImpl::WebUIImpl(WebContents* contents) - : link_transition_type_(PAGE_TRANSITION_LINK), + : link_transition_type_(ui::PAGE_TRANSITION_LINK), bindings_(BINDINGS_POLICY_WEB_UI), web_contents_(contents) { DCHECK(contents); @@ -110,11 +110,11 @@ void WebUIImpl::OverrideTitle(const base::string16& title) { overridden_title_ = title; } -PageTransition WebUIImpl::GetLinkTransitionType() const { +ui::PageTransition WebUIImpl::GetLinkTransitionType() const { return link_transition_type_; } -void WebUIImpl::SetLinkTransitionType(PageTransition type) { +void WebUIImpl::SetLinkTransitionType(ui::PageTransition type) { link_transition_type_ = type; } diff --git a/content/browser/webui/web_ui_impl.h b/content/browser/webui/web_ui_impl.h index 40cb559..8dad9d97 100644 --- a/content/browser/webui/web_ui_impl.h +++ b/content/browser/webui/web_ui_impl.h @@ -37,8 +37,8 @@ class CONTENT_EXPORT WebUIImpl : public WebUI, virtual float GetDeviceScaleFactor() const OVERRIDE; virtual const base::string16& GetOverriddenTitle() const OVERRIDE; virtual void OverrideTitle(const base::string16& title) OVERRIDE; - virtual PageTransition GetLinkTransitionType() const OVERRIDE; - virtual void SetLinkTransitionType(PageTransition type) OVERRIDE; + virtual ui::PageTransition GetLinkTransitionType() const OVERRIDE; + virtual void SetLinkTransitionType(ui::PageTransition type) OVERRIDE; virtual int GetBindings() const OVERRIDE; virtual void SetBindings(int bindings) OVERRIDE; virtual void OverrideJavaScriptFrame(const std::string& frame_name) OVERRIDE; @@ -99,7 +99,7 @@ class CONTENT_EXPORT WebUIImpl : public WebUI, // Options that may be overridden by individual Web UI implementations. The // bool options default to false. See the public getters for more information. base::string16 overridden_title_; // Defaults to empty string. - PageTransition link_transition_type_; // Defaults to LINK. + ui::PageTransition link_transition_type_; // Defaults to LINK. int bindings_; // The bindings from BindingsPolicy that should be enabled for // this page. diff --git a/content/child/request_extra_data.cc b/content/child/request_extra_data.cc index 18f58a7..5a1c689fc 100644 --- a/content/child/request_extra_data.cc +++ b/content/child/request_extra_data.cc @@ -18,7 +18,7 @@ RequestExtraData::RequestExtraData() parent_is_main_frame_(false), parent_render_frame_id_(-1), allow_download_(true), - transition_type_(PAGE_TRANSITION_LINK), + transition_type_(ui::PAGE_TRANSITION_LINK), should_replace_current_entry_(false), transferred_request_child_id_(-1), transferred_request_request_id_(-1), diff --git a/content/child/request_extra_data.h b/content/child/request_extra_data.h index bae5512..0db7699 100644 --- a/content/child/request_extra_data.h +++ b/content/child/request_extra_data.h @@ -7,10 +7,10 @@ #include "base/compiler_specific.h" #include "content/common/content_export.h" -#include "content/public/common/page_transition_types.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebPageVisibilityState.h" +#include "ui/base/page_transition_types.h" namespace content { @@ -53,8 +53,8 @@ class CONTENT_EXPORT RequestExtraData void set_allow_download(bool allow_download) { allow_download_ = allow_download; } - PageTransition transition_type() const { return transition_type_; } - void set_transition_type(PageTransition transition_type) { + ui::PageTransition transition_type() const { return transition_type_; } + void set_transition_type(ui::PageTransition transition_type) { transition_type_ = transition_type; } bool should_replace_current_entry() const { @@ -110,7 +110,7 @@ class CONTENT_EXPORT RequestExtraData bool parent_is_main_frame_; int parent_render_frame_id_; bool allow_download_; - PageTransition transition_type_; + ui::PageTransition transition_type_; bool should_replace_current_entry_; int transferred_request_child_id_; int transferred_request_request_id_; diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h index aa9bd3f..5beaf07 100644 --- a/content/common/frame_messages.h +++ b/content/common/frame_messages.h @@ -211,7 +211,7 @@ IPC_STRUCT_BEGIN(FrameMsg_Navigate_Params) IPC_STRUCT_MEMBER(std::vector<GURL>, redirects) // The type of transition. - IPC_STRUCT_MEMBER(content::PageTransition, transition) + IPC_STRUCT_MEMBER(ui::PageTransition, transition) // Informs the RenderView the pending navigation should replace the current // history entry when it commits. This is used for cross-process redirects so @@ -295,7 +295,7 @@ IPC_STRUCT_BEGIN(FrameHostMsg_BeginNavigation_Params) // True if the request was user initiated. IPC_STRUCT_MEMBER(bool, has_user_gesture) - IPC_STRUCT_MEMBER(content::PageTransition, transition_type) + IPC_STRUCT_MEMBER(ui::PageTransition, transition_type) // Whether this navigation should replace the current session history entry on // commit. diff --git a/content/common/resource_messages.h b/content/common/resource_messages.h index ed00934..161fea8 100644 --- a/content/common/resource_messages.h +++ b/content/common/resource_messages.h @@ -216,7 +216,7 @@ IPC_STRUCT_BEGIN(ResourceHostMsg_Request) // -1 if unknown / invalid. IPC_STRUCT_MEMBER(int, parent_render_frame_id) - IPC_STRUCT_MEMBER(content::PageTransition, transition_type) + IPC_STRUCT_MEMBER(ui::PageTransition, transition_type) // For navigations, whether this navigation should replace the current session // history entry on commit. diff --git a/content/content.gyp b/content/content.gyp index 494b8af..1ed85be 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -429,7 +429,6 @@ 'content_strings_grd', 'content_gamepad_mapping', 'gesture_event_type_java', - 'page_transition_types_java', 'popup_item_type_java', 'result_codes_java', 'selection_event_type_java', @@ -477,18 +476,6 @@ 'includes': [ '../build/android/java_cpp_template.gypi' ], }, { - 'target_name': 'page_transition_types_java', - 'type': 'none', - 'sources': [ - 'public/android/java/src/org/chromium/content_public/browser/PageTransitionTypes.template', - ], - 'variables': { - 'package_name': 'org/chromium/content_public/browser', - 'template_deps': ['public/common/page_transition_types_list.h'], - }, - 'includes': [ '../build/android/java_cpp_template.gypi' ], - }, - { 'target_name': 'popup_item_type_java', 'type': 'none', 'sources': [ diff --git a/content/content_common.gypi b/content/content_common.gypi index d6ab86e..85847fd 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -80,9 +80,6 @@ 'public/common/menu_item.h', 'public/common/page_state.cc', 'public/common/page_state.h', - 'public/common/page_transition_types.cc', - 'public/common/page_transition_types.h', - 'public/common/page_transition_types_list.h', 'public/common/page_type.h', 'public/common/page_zoom.h', 'public/common/pepper_plugin_info.cc', @@ -534,7 +531,6 @@ ['include', '^public/common/frame_navigate_params\\.cc$'], ['include', '^public/common/media_stream_request\\.cc$'], ['include', '^public/common/page_state\\.cc$'], - ['include', '^public/common/page_transition_types\\.cc$'], ['include', '^public/common/password_form\\.cc$'], ['include', '^public/common/signed_certificate_timestamp_id_and_status\\.cc$'], ['include', '^public/common/speech_recognition_result\\.cc$'], diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn index 92ca279..135bb6e 100644 --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn @@ -44,7 +44,6 @@ android_library("content_java") { ":common_aidl", ":content_gamepad_mapping_java", ":gesture_event_type_java", - ":page_transition_types_java", ":popup_item_type_java", ":result_codes_java", ":selection_event_type_java", @@ -121,16 +120,6 @@ java_cpp_template("gesture_event_type_java") { ] } -java_cpp_template("page_transition_types_java") { - sources = [ - "java/src/org/chromium/content_public/browser/PageTransitionTypes.template", - ] - package_name = "org/chromium/content/browser" - inputs = [ - "//content/public/common/page_transition_types_list.h" - ] -} - java_cpp_template("popup_item_type_java") { sources = [ "java/src/org/chromium/content/browser/input/PopupItemType.template", diff --git a/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java b/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java index aa5001a..6237141 100644 --- a/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java +++ b/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java @@ -110,7 +110,7 @@ public abstract class WebContentsObserverAndroid { * @param isMainFrame Whether the load is happening for the main frame. * @param url The committed URL being navigated to. * @param transitionType The transition type as defined in - * {@link org.chromium.content.browser.PageTransitionTypes} for the load. + * {@link org.chromium.ui.base.PageTransitionTypes} for the load. */ @CalledByNative public void didCommitProvisionalLoadForFrame( diff --git a/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java b/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java index 491cc28..86282e3 100644 --- a/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java +++ b/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java @@ -7,6 +7,7 @@ package org.chromium.content_public.browser; import org.chromium.base.CalledByNative; import org.chromium.base.JNINamespace; import org.chromium.content_public.common.Referrer; +import org.chromium.ui.base.PageTransitionTypes; import java.util.Locale; import java.util.Map; diff --git a/content/public/browser/download_item.h b/content/public/browser/download_item.h index 1e66f8b..a13b89d 100644 --- a/content/public/browser/download_item.h +++ b/content/public/browser/download_item.h @@ -27,7 +27,7 @@ #include "base/supports_user_data.h" #include "content/public/browser/download_danger_type.h" #include "content/public/browser/download_interrupt_reasons.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" class GURL; @@ -189,7 +189,7 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData { virtual std::string GetOriginalMimeType() const = 0; virtual std::string GetRemoteAddress() const = 0; virtual bool HasUserGesture() const = 0; - virtual PageTransition GetTransitionType() const = 0; + virtual ui::PageTransition GetTransitionType() const = 0; virtual const std::string& GetLastModifiedTime() const = 0; virtual const std::string& GetETag() const = 0; virtual bool IsSavePackageDownload() const = 0; diff --git a/content/public/browser/load_notification_details.h b/content/public/browser/load_notification_details.h index 70efdd8..22af84c 100644 --- a/content/public/browser/load_notification_details.h +++ b/content/public/browser/load_notification_details.h @@ -7,7 +7,7 @@ #include "base/time/time.h" #include "content/public/browser/navigation_controller.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" namespace content { @@ -17,7 +17,7 @@ namespace content { // log page load metrics. struct LoadNotificationDetails { LoadNotificationDetails(const GURL& url, - PageTransition origin, + ui::PageTransition origin, base::TimeDelta load_time, NavigationController* controller, int session_index) @@ -37,7 +37,7 @@ struct LoadNotificationDetails { int session_index; // The type of action that caused the load. - PageTransition origin; + ui::PageTransition origin; // The NavigationController for the load. NavigationController* controller; diff --git a/content/public/browser/navigation_controller.cc b/content/public/browser/navigation_controller.cc index f0b3f46..6a1e87f 100644 --- a/content/public/browser/navigation_controller.cc +++ b/content/public/browser/navigation_controller.cc @@ -11,7 +11,7 @@ namespace content { NavigationController::LoadURLParams::LoadURLParams(const GURL& url) : url(url), load_type(LOAD_TYPE_DEFAULT), - transition_type(PAGE_TRANSITION_LINK), + transition_type(ui::PAGE_TRANSITION_LINK), frame_tree_node_id(-1), is_renderer_initiated(false), override_user_agent(UA_OVERRIDE_INHERIT), diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h index 08ea0b9..1daf03c 100644 --- a/content/public/browser/navigation_controller.h +++ b/content/public/browser/navigation_controller.h @@ -14,8 +14,8 @@ #include "content/common/content_export.h" #include "content/public/browser/global_request_id.h" #include "content/public/browser/session_storage_namespace.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" namespace base { @@ -94,7 +94,7 @@ class NavigationController { CONTENT_EXPORT static NavigationEntry* CreateNavigationEntry( const GURL& url, const Referrer& referrer, - PageTransition transition, + ui::PageTransition transition, bool is_renderer_initiated, const std::string& extra_headers, BrowserContext* browser_context); @@ -109,7 +109,7 @@ class NavigationController { // PageTransition for this load. See PageTransition for details. // Note the default value in constructor below. - PageTransition transition_type; + ui::PageTransition transition_type; // The FrameTreeNode ID for the frame to navigate, or -1 for the main frame. int64 frame_tree_node_id; @@ -296,7 +296,7 @@ class NavigationController { // request. Extra headers are separated by \n. virtual void LoadURL(const GURL& url, const Referrer& referrer, - PageTransition type, + ui::PageTransition type, const std::string& extra_headers) = 0; // More general version of LoadURL. See comments in LoadURLParams for diff --git a/content/public/browser/navigation_entry.h b/content/public/browser/navigation_entry.h index 6d69b0d..de8ee49 100644 --- a/content/public/browser/navigation_entry.h +++ b/content/public/browser/navigation_entry.h @@ -11,9 +11,9 @@ #include "base/strings/string16.h" #include "base/time/time.h" #include "content/common/content_export.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/page_type.h" #include "content/public/common/referrer.h" +#include "ui/base/page_transition_types.h" class GURL; @@ -110,8 +110,8 @@ class NavigationEntry { // The transition type indicates what the user did to move to this page from // the previous page. - virtual void SetTransitionType(content::PageTransition transition_type) = 0; - virtual content::PageTransition GetTransitionType() const = 0; + virtual void SetTransitionType(ui::PageTransition transition_type) = 0; + virtual ui::PageTransition GetTransitionType() const = 0; // The user typed URL was the URL that the user initiated the navigation // with, regardless of any redirects. This is used to generate keywords, for diff --git a/content/public/browser/page_navigator.cc b/content/public/browser/page_navigator.cc index dc9b3c53..f585501 100644 --- a/content/public/browser/page_navigator.cc +++ b/content/public/browser/page_navigator.cc @@ -10,7 +10,7 @@ OpenURLParams::OpenURLParams( const GURL& url, const Referrer& referrer, WindowOpenDisposition disposition, - PageTransition transition, + ui::PageTransition transition, bool is_renderer_initiated) : url(url), referrer(referrer), @@ -28,7 +28,7 @@ OpenURLParams::OpenURLParams( const Referrer& referrer, int64 frame_tree_node_id, WindowOpenDisposition disposition, - PageTransition transition, + ui::PageTransition transition, bool is_renderer_initiated) : url(url), referrer(referrer), @@ -45,7 +45,7 @@ OpenURLParams::OpenURLParams() : uses_post(false), frame_tree_node_id(-1), disposition(UNKNOWN), - transition(PageTransitionFromInt(0)), + transition(ui::PAGE_TRANSITION_LINK), is_renderer_initiated(false), should_replace_current_entry(false), user_gesture(true) { diff --git a/content/public/browser/page_navigator.h b/content/public/browser/page_navigator.h index 849d4ca6..0cdba29 100644 --- a/content/public/browser/page_navigator.h +++ b/content/public/browser/page_navigator.h @@ -15,8 +15,8 @@ #include "base/memory/ref_counted_memory.h" #include "content/common/content_export.h" #include "content/public/browser/global_request_id.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" +#include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" #include "url/gurl.h" @@ -28,13 +28,13 @@ struct CONTENT_EXPORT OpenURLParams { OpenURLParams(const GURL& url, const Referrer& referrer, WindowOpenDisposition disposition, - PageTransition transition, + ui::PageTransition transition, bool is_renderer_initiated); OpenURLParams(const GURL& url, const Referrer& referrer, int64 frame_tree_node_id, WindowOpenDisposition disposition, - PageTransition transition, + ui::PageTransition transition, bool is_renderer_initiated); ~OpenURLParams(); @@ -66,7 +66,7 @@ struct CONTENT_EXPORT OpenURLParams { WindowOpenDisposition disposition; // The transition type of navigation. - PageTransition transition; + ui::PageTransition transition; // Whether this navigation is initiated by the renderer process. bool is_renderer_initiated; diff --git a/content/public/browser/resource_request_info.h b/content/public/browser/resource_request_info.h index 7683d23..6c86846 100644 --- a/content/public/browser/resource_request_info.h +++ b/content/public/browser/resource_request_info.h @@ -7,10 +7,10 @@ #include "base/basictypes.h" #include "content/common/content_export.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/resource_type.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "third_party/WebKit/public/web/WebPageVisibilityState.h" +#include "ui/base/page_transition_types.h" namespace net { class URLRequest; @@ -94,7 +94,7 @@ class ResourceRequestInfo { virtual blink::WebPageVisibilityState GetVisibilityState() const = 0; // Returns the associated page transition type. - virtual PageTransition GetPageTransition() const = 0; + virtual ui::PageTransition GetPageTransition() const = 0; // True if the request was initiated by a user action (like a tap to follow // a link). diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc index d930aed..72cabb4 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc @@ -92,7 +92,7 @@ void WebContentsDelegate::ViewSourceForTab(WebContents* source, GURL url = GURL(kViewSourceScheme + std::string(":") + page_url.spec()); OpenURLFromTab(source, OpenURLParams(url, Referrer(), NEW_FOREGROUND_TAB, - PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); } void WebContentsDelegate::ViewSourceForFrame(WebContents* source, @@ -102,7 +102,7 @@ void WebContentsDelegate::ViewSourceForFrame(WebContents* source, GURL url = GURL(kViewSourceScheme + std::string(":") + frame_url.spec()); OpenURLFromTab(source, OpenURLParams(url, Referrer(), NEW_FOREGROUND_TAB, - PAGE_TRANSITION_LINK, false)); + ui::PAGE_TRANSITION_LINK, false)); } bool WebContentsDelegate::PreHandleKeyboardEvent( diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h index d040256..0f630f3 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -15,7 +15,6 @@ #include "content/public/browser/invalidate_type.h" #include "content/public/browser/navigation_type.h" #include "content/public/common/media_stream_request.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/window_container_type.h" #include "third_party/WebKit/public/web/WebDragOperation.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h index 846bf94..af9593e 100644 --- a/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h @@ -10,10 +10,10 @@ #include "content/common/content_export.h" #include "content/public/browser/navigation_controller.h" #include "content/public/common/frame_navigate_params.h" -#include "content/public/common/page_transition_types.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" namespace content { @@ -154,7 +154,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener, virtual void DidCommitProvisionalLoadForFrame( RenderFrameHost* render_frame_host, const GURL& url, - PageTransition transition_type) {} + ui::PageTransition transition_type) {} // This method is invoked when the provisional load failed. virtual void DidFailProvisionalLoad( @@ -234,7 +234,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener, const GURL& url, const Referrer& referrer, WindowOpenDisposition disposition, - PageTransition transition, + ui::PageTransition transition, int64 source_frame_id) {} virtual void FrameDetached(RenderFrameHost* render_frame_host) {} diff --git a/content/public/browser/web_ui.h b/content/public/browser/web_ui.h index 52ce114..8568530 100644 --- a/content/public/browser/web_ui.h +++ b/content/public/browser/web_ui.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/strings/string16.h" #include "content/common/content_export.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" class GURL; @@ -64,8 +64,8 @@ class CONTENT_EXPORT WebUI { // Returns the transition type that should be used for link clicks on this // Web UI. This will default to LINK but may be overridden. - virtual PageTransition GetLinkTransitionType() const = 0; - virtual void SetLinkTransitionType(PageTransition type) = 0; + virtual ui::PageTransition GetLinkTransitionType() const = 0; + virtual void SetLinkTransitionType(ui::PageTransition type) = 0; // Allows a controller to override the BindingsPolicy that should be enabled // for this page. diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h index eede504..1d045b0 100644 --- a/content/public/common/common_param_traits_macros.h +++ b/content/public/common/common_param_traits_macros.h @@ -9,7 +9,6 @@ #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ #include "content/public/common/console_message_level.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "content/public/common/security_style.h" #include "content/public/common/ssl_status.h" @@ -23,12 +22,13 @@ #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebWindowFeatures.h" +#include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" #undef IPC_MESSAGE_EXPORT #define IPC_MESSAGE_EXPORT CONTENT_EXPORT -IPC_ENUM_TRAITS(content::PageTransition) // Bitmask. +IPC_ENUM_TRAITS(ui::PageTransition) // Bitmask. IPC_ENUM_TRAITS_MAX_VALUE(net::NetworkChangeNotifier::ConnectionType, net::NetworkChangeNotifier::CONNECTION_LAST) IPC_ENUM_TRAITS_MAX_VALUE(content::ConsoleMessageLevel, diff --git a/content/public/common/frame_navigate_params.cc b/content/public/common/frame_navigate_params.cc index 933edf1..637cec5 100644 --- a/content/public/common/frame_navigate_params.cc +++ b/content/public/common/frame_navigate_params.cc @@ -8,7 +8,7 @@ namespace content { FrameNavigateParams::FrameNavigateParams() : page_id(0), - transition(PAGE_TRANSITION_LINK), + transition(ui::PAGE_TRANSITION_LINK), should_update_history(false) { } diff --git a/content/public/common/frame_navigate_params.h b/content/public/common/frame_navigate_params.h index 2f9656a..b704b8e 100644 --- a/content/public/common/frame_navigate_params.h +++ b/content/public/common/frame_navigate_params.h @@ -9,9 +9,9 @@ #include <vector> #include "content/common/content_export.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" #include "net/base/host_port_pair.h" +#include "ui/base/page_transition_types.h" #include "url/gurl.h" namespace content { @@ -42,7 +42,7 @@ struct CONTENT_EXPORT FrameNavigateParams { content::Referrer referrer; // The type of transition. - PageTransition transition; + ui::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, diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc index bb5ffaa..2435d2c 100644 --- a/content/public/renderer/content_renderer_client.cc +++ b/content/public/renderer/content_renderer_client.cc @@ -117,7 +117,7 @@ bool ContentRendererClient::ShouldFork(blink::WebFrame* frame, bool ContentRendererClient::WillSendRequest( blink::WebFrame* frame, - PageTransition transition_type, + ui::PageTransition transition_type, const GURL& url, const GURL& first_party_for_cookies, GURL* new_url) { diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index e3aef3e..55db98c 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -11,11 +11,11 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "content/public/common/content_client.h" -#include "content/public/common/page_transition_types.h" #include "ipc/ipc_message.h" #include "third_party/WebKit/public/web/WebNavigationPolicy.h" #include "third_party/WebKit/public/web/WebNavigationType.h" #include "third_party/WebKit/public/web/WebPageVisibilityState.h" +#include "ui/base/page_transition_types.h" #include "v8/include/v8.h" class GURL; @@ -213,7 +213,7 @@ class CONTENT_EXPORT ContentRendererClient { // Notifies the embedder that the given frame is requesting the resource at // |url|. If the function returns true, the url is changed to |new_url|. virtual bool WillSendRequest(blink::WebFrame* frame, - PageTransition transition_type, + ui::PageTransition transition_type, const GURL& url, const GURL& first_party_for_cookies, GURL* new_url); diff --git a/content/public/renderer/navigation_state.cc b/content/public/renderer/navigation_state.cc index a1fc183..e5f91fa 100644 --- a/content/public/renderer/navigation_state.cc +++ b/content/public/renderer/navigation_state.cc @@ -6,7 +6,7 @@ namespace content { -NavigationState::NavigationState(content::PageTransition transition_type, +NavigationState::NavigationState(ui::PageTransition transition_type, bool is_content_initiated, int32 pending_page_id, int pending_history_list_offset, diff --git a/content/public/renderer/navigation_state.h b/content/public/renderer/navigation_state.h index 64b8511..15eac26 100644 --- a/content/public/renderer/navigation_state.h +++ b/content/public/renderer/navigation_state.h @@ -8,7 +8,7 @@ #include <string> #include "content/common/content_export.h" -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" namespace content { @@ -23,7 +23,7 @@ class CONTENT_EXPORT NavigationState { int32 pending_page_id, int pending_history_list_offset, bool history_list_was_cleared, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { return new NavigationState(transition_type, false, pending_page_id, @@ -33,7 +33,7 @@ class CONTENT_EXPORT NavigationState { static NavigationState* CreateContentInitiated() { return new NavigationState( - content::PAGE_TRANSITION_LINK, true, -1, -1, false); + ui::PAGE_TRANSITION_LINK, true, -1, -1, false); } // Contains the page_id for this navigation or -1 if there is none yet. @@ -70,8 +70,8 @@ class CONTENT_EXPORT NavigationState { // Contains the transition type that the browser specified when it // initiated the load. - content::PageTransition transition_type() const { return transition_type_; } - void set_transition_type(content::PageTransition type) { + ui::PageTransition transition_type() const { return transition_type_; } + void set_transition_type(ui::PageTransition type) { transition_type_ = type; } @@ -116,13 +116,13 @@ class CONTENT_EXPORT NavigationState { const std::string& extra_headers() { return extra_headers_; } private: - NavigationState(content::PageTransition transition_type, + NavigationState(ui::PageTransition transition_type, bool is_content_initiated, int32 pending_page_id, int pending_history_list_offset, bool history_list_was_cleared); - content::PageTransition transition_type_; + ui::PageTransition transition_type_; bool request_committed_; bool is_content_initiated_; int32 pending_page_id_; diff --git a/content/public/test/mock_download_item.h b/content/public/test/mock_download_item.h index d9e3908..f027a91 100644 --- a/content/public/test/mock_download_item.h +++ b/content/public/test/mock_download_item.h @@ -63,7 +63,7 @@ class MockDownloadItem : public DownloadItem { MOCK_CONST_METHOD0(GetReferrerCharset, std::string()); MOCK_CONST_METHOD0(GetRemoteAddress, std::string()); MOCK_CONST_METHOD0(HasUserGesture, bool()); - MOCK_CONST_METHOD0(GetTransitionType, PageTransition()); + MOCK_CONST_METHOD0(GetTransitionType, ui::PageTransition()); MOCK_CONST_METHOD0(GetLastModifiedTime, const std::string&()); MOCK_CONST_METHOD0(GetETag, const std::string&()); MOCK_CONST_METHOD0(IsSavePackageDownload, bool()); diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc index b0f2570..25615bd 100644 --- a/content/public/test/render_view_test.cc +++ b/content/public/test/render_view_test.cc @@ -412,7 +412,7 @@ void RenderViewTest::GoToOffset(int offset, const PageState& state) { FrameMsg_Navigate_Params navigate_params; navigate_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; - navigate_params.transition = PAGE_TRANSITION_FORWARD_BACK; + navigate_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK; navigate_params.current_history_list_length = history_list_length; navigate_params.current_history_list_offset = impl->history_list_offset(); navigate_params.pending_history_list_offset = pending_offset; diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc index e96a13c..e13d189 100644 --- a/content/public/test/test_renderer_host.cc +++ b/content/public/test/test_renderer_host.cc @@ -162,7 +162,7 @@ void RenderViewHostTestHarness::Reload() { controller().Reload(false); static_cast<TestRenderViewHost*>( rvh())->SendNavigateWithTransition( - entry->GetPageID(), entry->GetURL(), PAGE_TRANSITION_RELOAD); + entry->GetPageID(), entry->GetURL(), ui::PAGE_TRANSITION_RELOAD); } void RenderViewHostTestHarness::FailedReload() { diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h index b1b4aec..2fd8f9d 100644 --- a/content/public/test/test_renderer_host.h +++ b/content/public/test/test_renderer_host.h @@ -9,9 +9,9 @@ #include "base/message_loop/message_loop.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" #if defined(USE_AURA) #include "ui/aura/test/aura_test_helper.h" @@ -60,7 +60,7 @@ class RenderFrameHostTester { // function for simulating the most common types of loads. virtual void SendNavigateWithTransition(int page_id, const GURL& url, - PageTransition transition) = 0; + ui::PageTransition transition) = 0; }; // An interface and utility for driving tests of RenderViewHost. @@ -111,7 +111,7 @@ class RenderViewHostTester { // parameters in the message to the "typical" values. This is a helper // function for simulating the most common types of loads. virtual void SendNavigateWithTransition(int page_id, const GURL& url, - PageTransition transition) = 0; + ui::PageTransition transition) = 0; // Calls OnBeforeUnloadACK on the main RenderFrameHost with the given // parameter. diff --git a/content/public/test/web_contents_tester.h b/content/public/test/web_contents_tester.h index 25a80f2..24953ed 100644 --- a/content/public/test/web_contents_tester.h +++ b/content/public/test/web_contents_tester.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_WEB_CONTENTS_TESTER_H_ #define CONTENT_PUBLIC_TEST_WEB_CONTENTS_TESTER_H_ -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" class GURL; @@ -80,14 +80,14 @@ class WebContentsTester { virtual void TestDidNavigate(RenderFrameHost* render_frame_host, int page_id, const GURL& url, - PageTransition transition) = 0; + ui::PageTransition transition) = 0; virtual void TestDidNavigateWithReferrer( RenderFrameHost* render_frame_host, int page_id, const GURL& url, const Referrer& referrer, - PageTransition transition) = 0; + ui::PageTransition transition) = 0; // Promote ComputeWebkitPrefs to public. virtual WebPreferences TestComputeWebkitPrefs() = 0; diff --git a/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc index 45b9130..736ebb6 100644 --- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc +++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc @@ -337,7 +337,7 @@ TEST_F(RendererAccessibilityTest, FrameMsg_Navigate_Params nav_params; nav_params.url = GURL("data:text/html,<p>Hello, again.</p>"); nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; - nav_params.transition = PAGE_TRANSITION_TYPED; + nav_params.transition = ui::PAGE_TRANSITION_TYPED; nav_params.current_history_list_length = 1; nav_params.current_history_list_offset = 0; nav_params.pending_history_list_offset = 1; diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 55ee716..6d1cc83 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -1939,9 +1939,9 @@ void RenderFrameImpl::willSubmitForm(blink::WebLocalFrame* frame, InternalDocumentStateData* internal_data = InternalDocumentStateData::FromDocumentState(document_state); - if (PageTransitionCoreTypeIs(navigation_state->transition_type(), - PAGE_TRANSITION_LINK)) { - navigation_state->set_transition_type(PAGE_TRANSITION_FORM_SUBMIT); + if (ui::PageTransitionCoreTypeIs(navigation_state->transition_type(), + ui::PAGE_TRANSITION_LINK)) { + navigation_state->set_transition_type(ui::PAGE_TRANSITION_FORM_SUBMIT); } // Save these to be processed when the ensuing navigation is committed. @@ -2014,7 +2014,7 @@ void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame, // marked with AUTO_SUBFRAME. See also didFailProvisionalLoad for how we // handle loading of error pages. document_state->navigation_state()->set_transition_type( - PAGE_TRANSITION_AUTO_SUBFRAME); + ui::PAGE_TRANSITION_AUTO_SUBFRAME); } FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), @@ -2128,8 +2128,8 @@ void RenderFrameImpl::didFailProvisionalLoad(blink::WebLocalFrame* frame, // state into account, if a location.replace() failed. bool replace = navigation_state->pending_page_id() != -1 || - PageTransitionCoreTypeIs(navigation_state->transition_type(), - PAGE_TRANSITION_AUTO_SUBFRAME); + ui::PageTransitionCoreTypeIs(navigation_state->transition_type(), + ui::PAGE_TRANSITION_AUTO_SUBFRAME); // If we failed on a browser initiated request, then make sure that our error // page load is regarded as the same browser initiated request. @@ -2647,7 +2647,7 @@ void RenderFrameImpl::willSendRequest( WebDataSource* data_source = provisional_data_source ? provisional_data_source : top_data_source; - PageTransition transition_type = PAGE_TRANSITION_LINK; + ui::PageTransition transition_type = ui::PAGE_TRANSITION_LINK; DocumentState* document_state = DocumentState::FromDataSource(data_source); DCHECK(document_state); InternalDocumentStateData* internal_data = @@ -3359,7 +3359,7 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(blink::WebFrame* frame) { params.contents_mime_type = ds->response().mimeType().utf8(); params.transition = navigation_state->transition_type(); - if (!PageTransitionIsMainFrame(params.transition)) { + if (!ui::PageTransitionIsMainFrame(params.transition)) { // If the main frame does a load, it should not be reported as a subframe // navigation. This can occur in the following case: // 1. You're on a site with frames. @@ -3371,7 +3371,7 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(blink::WebFrame* frame) { // We don't want that, because any navigation that changes the toplevel // frame should be tracked as a toplevel navigation (this allows us to // update the URL bar, etc). - params.transition = PAGE_TRANSITION_LINK; + params.transition = ui::PAGE_TRANSITION_LINK; } // If the page contained a client redirect (meta refresh, document.loc...), @@ -3379,8 +3379,8 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(blink::WebFrame* frame) { if (ds->isClientRedirect()) { params.referrer = Referrer(params.redirects[0], ds->request().referrerPolicy()); - params.transition = static_cast<PageTransition>( - params.transition | PAGE_TRANSITION_CLIENT_REDIRECT); + params.transition = ui::PageTransitionFromInt( + params.transition | ui::PAGE_TRANSITION_CLIENT_REDIRECT); } else { params.referrer = RenderViewImpl::GetReferrerFromRequest( frame, ds->request()); @@ -3421,9 +3421,9 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(blink::WebFrame* frame) { // SendDidCommitProvisionalLoad has been called since WillNavigateToURL was // called to initiate the load. if (render_view_->page_id_ > render_view_->last_page_id_sent_to_browser_) - params.transition = PAGE_TRANSITION_MANUAL_SUBFRAME; + params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; else - params.transition = PAGE_TRANSITION_AUTO_SUBFRAME; + params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; DCHECK(!navigation_state->history_list_was_cleared()); params.history_list_was_cleared = false; @@ -3439,7 +3439,7 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(blink::WebFrame* frame) { // If we end up reusing this WebRequest (for example, due to a #ref click), // we don't want the transition type to persist. Just clear it. - navigation_state->set_transition_type(PAGE_TRANSITION_LINK); + navigation_state->set_transition_type(ui::PAGE_TRANSITION_LINK); } WebElement RenderFrameImpl::GetFocusedElement() { diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 55b6ff0..1a10d90 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -368,7 +368,7 @@ TEST_F(RenderViewImplTest, OnNavigationHttpPost) { // An http url will trigger a resource load so cannot be used here. nav_params.url = GURL("data:text/html,<div>Page</div>"); nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; - nav_params.transition = PAGE_TRANSITION_TYPED; + nav_params.transition = ui::PAGE_TRANSITION_TYPED; nav_params.page_id = -1; nav_params.is_post = true; nav_params.browser_navigation_start = base::TimeTicks::FromInternalValue(1); @@ -573,7 +573,7 @@ TEST_F(RenderViewImplTest, SendSwapOutACK) { FrameMsg_Navigate_Params nav_params; nav_params.url = GURL("data:text/html,<div>Page B</div>"); nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; - nav_params.transition = PAGE_TRANSITION_TYPED; + nav_params.transition = ui::PAGE_TRANSITION_TYPED; nav_params.current_history_list_length = 1; nav_params.current_history_list_offset = 0; nav_params.pending_history_list_offset = 1; @@ -610,7 +610,7 @@ TEST_F(RenderViewImplTest, ReloadWhileSwappedOut) { // Back to page A (page_id 1) and commit. FrameMsg_Navigate_Params params_A; params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL; - params_A.transition = PAGE_TRANSITION_FORWARD_BACK; + params_A.transition = ui::PAGE_TRANSITION_FORWARD_BACK; params_A.current_history_list_length = 2; params_A.current_history_list_offset = 1; params_A.pending_history_list_offset = 0; @@ -636,7 +636,7 @@ TEST_F(RenderViewImplTest, ReloadWhileSwappedOut) { FrameMsg_Navigate_Params nav_params; nav_params.url = GURL("data:text/html,<div>Page A</div>"); nav_params.navigation_type = FrameMsg_Navigate_Type::RELOAD; - nav_params.transition = PAGE_TRANSITION_RELOAD; + nav_params.transition = ui::PAGE_TRANSITION_RELOAD; nav_params.current_history_list_length = 2; nav_params.current_history_list_offset = 0; nav_params.pending_history_list_offset = 0; @@ -715,7 +715,7 @@ TEST_F(RenderViewImplTest, DISABLED_LastCommittedUpdateState) { // Go back to C and commit, preparing for our real test. FrameMsg_Navigate_Params params_C; params_C.navigation_type = FrameMsg_Navigate_Type::NORMAL; - params_C.transition = PAGE_TRANSITION_FORWARD_BACK; + params_C.transition = ui::PAGE_TRANSITION_FORWARD_BACK; params_C.current_history_list_length = 4; params_C.current_history_list_offset = 3; params_C.pending_history_list_offset = 2; @@ -733,7 +733,7 @@ TEST_F(RenderViewImplTest, DISABLED_LastCommittedUpdateState) { // Back to page B (page_id 2), without committing. FrameMsg_Navigate_Params params_B; params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL; - params_B.transition = PAGE_TRANSITION_FORWARD_BACK; + params_B.transition = ui::PAGE_TRANSITION_FORWARD_BACK; params_B.current_history_list_length = 4; params_B.current_history_list_offset = 2; params_B.pending_history_list_offset = 1; @@ -745,7 +745,7 @@ TEST_F(RenderViewImplTest, DISABLED_LastCommittedUpdateState) { // Back to page A (page_id 1) and commit. FrameMsg_Navigate_Params params; params.navigation_type = FrameMsg_Navigate_Type::NORMAL; - params.transition = PAGE_TRANSITION_FORWARD_BACK; + params.transition = ui::PAGE_TRANSITION_FORWARD_BACK; params_B.current_history_list_length = 4; params_B.current_history_list_offset = 2; params_B.pending_history_list_offset = 0; @@ -800,7 +800,7 @@ TEST_F(RenderViewImplTest, StaleNavigationsIgnored) { // Back to page A (page_id 1) and commit. FrameMsg_Navigate_Params params_A; params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL; - params_A.transition = PAGE_TRANSITION_FORWARD_BACK; + params_A.transition = ui::PAGE_TRANSITION_FORWARD_BACK; params_A.current_history_list_length = 2; params_A.current_history_list_offset = 1; params_A.pending_history_list_offset = 0; @@ -819,7 +819,7 @@ TEST_F(RenderViewImplTest, StaleNavigationsIgnored) { // The browser then sends a stale navigation to B, which should be ignored. FrameMsg_Navigate_Params params_B; params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL; - params_B.transition = PAGE_TRANSITION_FORWARD_BACK; + params_B.transition = ui::PAGE_TRANSITION_FORWARD_BACK; params_B.current_history_list_length = 2; params_B.current_history_list_offset = 0; params_B.pending_history_list_offset = 1; @@ -887,7 +887,7 @@ TEST_F(RenderViewImplTest, DontIgnoreBackAfterNavEntryLimit) { // Ensure that going back to page B (page_id 2) at offset 0 is successful. FrameMsg_Navigate_Params params_B; params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL; - params_B.transition = PAGE_TRANSITION_FORWARD_BACK; + params_B.transition = ui::PAGE_TRANSITION_FORWARD_BACK; params_B.current_history_list_length = 2; params_B.current_history_list_offset = 1; params_B.pending_history_list_offset = 0; @@ -2084,7 +2084,7 @@ TEST_F(RenderViewImplTest, NavigateFrame) { FrameMsg_Navigate_Params nav_params; nav_params.url = GURL("data:text/html,world"); nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; - nav_params.transition = PAGE_TRANSITION_TYPED; + nav_params.transition = ui::PAGE_TRANSITION_TYPED; nav_params.current_history_list_length = 1; nav_params.current_history_list_offset = 0; nav_params.pending_history_list_offset = 1; @@ -2453,7 +2453,7 @@ TEST_F(RenderViewImplTest, NavigationStartOverride) { FrameMsg_Navigate_Params early_nav_params; early_nav_params.url = GURL("data:text/html,<div>Page</div>"); early_nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; - early_nav_params.transition = PAGE_TRANSITION_TYPED; + early_nav_params.transition = ui::PAGE_TRANSITION_TYPED; early_nav_params.page_id = -1; early_nav_params.is_post = true; early_nav_params.browser_navigation_start = @@ -2472,7 +2472,7 @@ TEST_F(RenderViewImplTest, NavigationStartOverride) { FrameMsg_Navigate_Params late_nav_params; late_nav_params.url = GURL("data:text/html,<div>Another page</div>"); late_nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; - late_nav_params.transition = PAGE_TRANSITION_TYPED; + late_nav_params.transition = ui::PAGE_TRANSITION_TYPED; late_nav_params.page_id = -1; late_nav_params.is_post = true; late_nav_params.browser_navigation_start = diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc index b10943d..685e5fe 100644 --- a/content/shell/browser/shell.cc +++ b/content/shell/browser/shell.cc @@ -171,8 +171,8 @@ void Shell::LoadURL(const GURL& url) { void Shell::LoadURLForFrame(const GURL& url, const std::string& frame_name) { NavigationController::LoadURLParams params(url); - params.transition_type = PageTransitionFromInt( - PAGE_TRANSITION_TYPED | PAGE_TRANSITION_FROM_ADDRESS_BAR); + params.transition_type = ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); params.frame_name = frame_name; web_contents_->GetController().LoadURLWithParams(params); web_contents_->Focus(); diff --git a/content/shell/browser/webkit_test_controller.cc b/content/shell/browser/webkit_test_controller.cc index 8fc8225..5b6a579 100644 --- a/content/shell/browser/webkit_test_controller.cc +++ b/content/shell/browser/webkit_test_controller.cc @@ -281,8 +281,8 @@ bool WebKitTestController::PrepareForLayoutTest( SendTestConfiguration(); NavigationController::LoadURLParams params(test_url); - params.transition_type = PageTransitionFromInt( - PAGE_TRANSITION_TYPED | PAGE_TRANSITION_FROM_ADDRESS_BAR); + params.transition_type = ui::PageTransitionFromInt( + ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); params.should_clear_history_list = true; main_window_->web_contents()->GetController().LoadURLWithParams(params); main_window_->web_contents()->Focus(); diff --git a/content/test/content_browser_test_utils_internal.cc b/content/test/content_browser_test_utils_internal.cc index be503b7..21a33d0 100644 --- a/content/test/content_browser_test_utils_internal.cc +++ b/content/test/content_browser_test_utils_internal.cc @@ -14,7 +14,7 @@ namespace content { void NavigateFrameToURL(FrameTreeNode* node, const GURL& url) { TestFrameNavigationObserver observer(node); NavigationController::LoadURLParams params(url); - params.transition_type = PageTransitionFromInt(PAGE_TRANSITION_LINK); + params.transition_type = ui::PAGE_TRANSITION_LINK; params.frame_tree_node_id = node->frame_tree_node_id(); node->navigator()->GetController()->LoadURLWithParams(params); observer.Wait(); diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc index e930c52..2f96bc8 100644 --- a/content/test/test_render_frame_host.cc +++ b/content/test/test_render_frame_host.cc @@ -7,10 +7,10 @@ #include "content/browser/frame_host/frame_tree.h" #include "content/browser/frame_host/render_frame_host_delegate.h" #include "content/common/frame_messages.h" -#include "content/public/common/page_transition_types.h" #include "content/test/test_render_view_host.h" #include "net/base/load_flags.h" #include "third_party/WebKit/public/web/WebPageVisibilityState.h" +#include "ui/base/page_transition_types.h" namespace content { @@ -66,22 +66,22 @@ TestRenderFrameHost* TestRenderFrameHost::AppendChild( void TestRenderFrameHost::SendNavigateWithTransition( int page_id, const GURL& url, - PageTransition transition) { + ui::PageTransition transition) { SendNavigateWithTransitionAndResponseCode(page_id, url, transition, 200); } void TestRenderFrameHost::SendNavigate(int page_id, const GURL& url) { - SendNavigateWithTransition(page_id, url, PAGE_TRANSITION_LINK); + SendNavigateWithTransition(page_id, url, ui::PAGE_TRANSITION_LINK); } void TestRenderFrameHost::SendFailedNavigate(int page_id, const GURL& url) { SendNavigateWithTransitionAndResponseCode( - page_id, url, PAGE_TRANSITION_RELOAD, 500); + page_id, url, ui::PAGE_TRANSITION_RELOAD, 500); } void TestRenderFrameHost::SendNavigateWithTransitionAndResponseCode( int page_id, - const GURL& url, PageTransition transition, + const GURL& url, ui::PageTransition transition, int response_code) { // DidStartProvisionalLoad may delete the pending entry that holds |url|, // so we keep a copy of it to use in SendNavigateWithParameters. @@ -96,7 +96,7 @@ void TestRenderFrameHost::SendNavigateWithOriginalRequestURL( const GURL& url, const GURL& original_request_url) { OnDidStartProvisionalLoadForFrame(url, false); - SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK, + SendNavigateWithParameters(page_id, url, ui::PAGE_TRANSITION_LINK, original_request_url, 200, 0, std::vector<GURL>()); } @@ -104,7 +104,7 @@ void TestRenderFrameHost::SendNavigateWithFile( int page_id, const GURL& url, const base::FilePath& file_path) { - SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK, url, 200, + SendNavigateWithParameters(page_id, url, ui::PAGE_TRANSITION_LINK, url, 200, &file_path, std::vector<GURL>()); } @@ -119,13 +119,13 @@ void TestRenderFrameHost::SendNavigateWithRedirects( const GURL& url, const std::vector<GURL>& redirects) { SendNavigateWithParameters( - page_id, url, PAGE_TRANSITION_LINK, url, 200, 0, redirects); + page_id, url, ui::PAGE_TRANSITION_LINK, url, 200, 0, redirects); } void TestRenderFrameHost::SendNavigateWithParameters( int page_id, const GURL& url, - PageTransition transition, + ui::PageTransition transition, const GURL& original_request_url, int response_code, const base::FilePath* file_path_for_history_item, @@ -151,8 +151,8 @@ void TestRenderFrameHost::SendNavigateWithParameters( url::Replacements<char> replacements; replacements.ClearRef(); - params.was_within_same_page = transition != PAGE_TRANSITION_RELOAD && - transition != PAGE_TRANSITION_TYPED && + params.was_within_same_page = transition != ui::PAGE_TRANSITION_RELOAD && + transition != ui::PAGE_TRANSITION_TYPED && url.ReplaceComponents(replacements) == GetLastCommittedURL().ReplaceComponents(replacements); @@ -173,7 +173,7 @@ void TestRenderFrameHost::SendBeginNavigationWithURL(const GURL& url) { params.referrer = Referrer(GURL(), blink::WebReferrerPolicyDefault); params.load_flags = net::LOAD_NORMAL; params.has_user_gesture = false; - params.transition_type = PAGE_TRANSITION_LINK; + params.transition_type = ui::PAGE_TRANSITION_LINK; params.should_replace_current_entry = false; params.allow_download = true; OnBeginNavigation(params); diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h index ec6be4d..8202b9a 100644 --- a/content/test/test_render_frame_host.h +++ b/content/test/test_render_frame_host.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/public/browser/web_contents_observer.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/test_renderer_host.h" #include "content/test/test_render_view_host.h" +#include "ui/base/page_transition_types.h" struct FrameHostMsg_DidCommitProvisionalLoad_Params; @@ -49,15 +49,16 @@ class TestRenderFrameHost : public RenderFrameHostImpl, // RenderFrameHostTester implementation. virtual TestRenderFrameHost* AppendChild( const std::string& frame_name) OVERRIDE; - virtual void SendNavigateWithTransition(int page_id, - const GURL& url, - PageTransition transition) OVERRIDE; + virtual void SendNavigateWithTransition( + int page_id, + const GURL& url, + ui::PageTransition transition) OVERRIDE; void SendNavigate(int page_id, const GURL& url); void SendFailedNavigate(int page_id, const GURL& url); void SendNavigateWithTransitionAndResponseCode( int page_id, - const GURL& url, PageTransition transition, + const GURL& url, ui::PageTransition transition, int response_code); void SendNavigateWithOriginalRequestURL( int page_id, @@ -76,7 +77,7 @@ class TestRenderFrameHost : public RenderFrameHostImpl, void SendNavigateWithParameters( int page_id, const GURL& url, - PageTransition transition, + ui::PageTransition transition, const GURL& original_request_url, int response_code, const base::FilePath* file_path_for_history_item, diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc index 1f54c8e..b243896 100644 --- a/content/test/test_render_view_host.cc +++ b/content/test/test_render_view_host.cc @@ -27,7 +27,7 @@ namespace content { void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, int page_id, const GURL& url, - PageTransition transition) { + ui::PageTransition transition) { params->page_id = page_id; params->url = url; params->referrer = Referrer(); @@ -272,7 +272,7 @@ void TestRenderViewHost::SendFailedNavigate(int page_id, const GURL& url) { void TestRenderViewHost::SendNavigateWithTransition( int page_id, const GURL& url, - PageTransition transition) { + ui::PageTransition transition) { main_render_frame_host_->SendNavigateWithTransition(page_id, url, transition); } @@ -299,7 +299,7 @@ void TestRenderViewHost::SendNavigateWithParams( void TestRenderViewHost::SendNavigateWithTransitionAndResponseCode( int page_id, const GURL& url, - PageTransition transition, + ui::PageTransition transition, int response_code) { main_render_frame_host_->SendNavigateWithTransitionAndResponseCode( page_id, url, transition, response_code); @@ -308,7 +308,7 @@ void TestRenderViewHost::SendNavigateWithTransitionAndResponseCode( void TestRenderViewHost::SendNavigateWithParameters( int page_id, const GURL& url, - PageTransition transition, + ui::PageTransition transition, const GURL& original_request_url, int response_code, const base::FilePath* file_path_for_history_item) { diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h index 0e7d09b..51f662d 100644 --- a/content/test/test_render_view_host.h +++ b/content/test/test_render_view_host.h @@ -13,10 +13,10 @@ #include "build/build_config.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/renderer_host/render_widget_host_view_base.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/test_renderer_host.h" #include "ui/base/ime/dummy_text_input_client.h" #include "ui/base/layout.h" +#include "ui/base/page_transition_types.h" #include "ui/gfx/vector2d_f.h" // This file provides a testing framework for mocking out the RenderProcessHost @@ -44,7 +44,7 @@ class TestWebContents; void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, int page_id, const GURL& url, - PageTransition transition_type); + ui::PageTransition transition_type); // TestRenderViewHostView ------------------------------------------------------ @@ -233,8 +233,10 @@ class TestRenderViewHost // TestRenderFrameHost should be used. virtual void SendNavigate(int page_id, const GURL& url) OVERRIDE; virtual void SendFailedNavigate(int page_id, const GURL& url) OVERRIDE; - virtual void SendNavigateWithTransition(int page_id, const GURL& url, - PageTransition transition) OVERRIDE; + virtual void SendNavigateWithTransition( + int page_id, + const GURL& url, + ui::PageTransition transition) OVERRIDE; // Calls OnNavigate on the RenderViewHost with the given information, // including a custom original request URL. Sets the rest of the @@ -315,7 +317,7 @@ class TestRenderViewHost void SendNavigateWithTransitionAndResponseCode(int page_id, const GURL& url, - PageTransition transition, + ui::PageTransition transition, int response_code); // Calls OnNavigate on the RenderViewHost with the given information. @@ -324,7 +326,7 @@ class TestRenderViewHost void SendNavigateWithParameters( int page_id, const GURL& url, - PageTransition transition, + ui::PageTransition transition, const GURL& original_request_url, int response_code, const base::FilePath* file_path_for_history_item); diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc index a8ffafb..fdc3918 100644 --- a/content/test/test_web_contents.cc +++ b/content/test/test_web_contents.cc @@ -18,9 +18,9 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/common/page_state.h" -#include "content/public/common/page_transition_types.h" #include "content/public/test/mock_render_process_host.h" #include "content/test/test_render_view_host.h" +#include "ui/base/page_transition_types.h" namespace content { @@ -61,7 +61,7 @@ TestRenderFrameHost* TestWebContents::GetPendingMainFrame() const { void TestWebContents::TestDidNavigate(RenderFrameHost* render_frame_host, int page_id, const GURL& url, - PageTransition transition) { + ui::PageTransition transition) { TestDidNavigateWithReferrer(render_frame_host, page_id, url, @@ -74,7 +74,7 @@ void TestWebContents::TestDidNavigateWithReferrer( int page_id, const GURL& url, const Referrer& referrer, - PageTransition transition) { + ui::PageTransition transition) { FrameHostMsg_DidCommitProvisionalLoad_Params params; params.page_id = page_id; @@ -124,7 +124,7 @@ WebContents* TestWebContents::Clone() { void TestWebContents::NavigateAndCommit(const GURL& url) { GetController().LoadURL( - url, Referrer(), PAGE_TRANSITION_LINK, std::string()); + url, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); GURL loaded_url(url); bool reverse_on_redirect = false; BrowserURLHandlerImpl::GetInstance()->RewriteURLIfNecessary( diff --git a/content/test/test_web_contents.h b/content/test/test_web_contents.h index 2daf7f3..8771af1 100644 --- a/content/test/test_web_contents.h +++ b/content/test/test_web_contents.h @@ -6,11 +6,11 @@ #define CONTENT_TEST_TEST_WEB_CONTENTS_H_ #include "content/browser/web_contents/web_contents_impl.h" -#include "content/public/common/page_transition_types.h" #include "content/public/common/web_preferences.h" #include "content/public/test/web_contents_tester.h" #include "content/test/test_render_frame_host.h" #include "content/test/test_render_view_host.h" +#include "ui/base/page_transition_types.h" class SiteInstanceImpl; @@ -42,12 +42,13 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester { virtual void TestDidNavigate(RenderFrameHost* render_frame_host, int page_id, const GURL& url, - PageTransition transition) OVERRIDE; - virtual void TestDidNavigateWithReferrer(RenderFrameHost* render_frame_host, - int page_id, - const GURL& url, - const Referrer& referrer, - PageTransition transition) OVERRIDE; + ui::PageTransition transition) OVERRIDE; + virtual void TestDidNavigateWithReferrer( + RenderFrameHost* render_frame_host, + int page_id, + const GURL& url, + const Referrer& referrer, + ui::PageTransition transition) OVERRIDE; virtual WebPreferences TestComputeWebkitPrefs() OVERRIDE; // State accessor. diff --git a/extensions/browser/app_window/app_window_contents.cc b/extensions/browser/app_window/app_window_contents.cc index 9f0425a..6c3909a 100644 --- a/extensions/browser/app_window/app_window_contents.cc +++ b/extensions/browser/app_window/app_window_contents.cc @@ -56,7 +56,7 @@ void AppWindowContentsImpl::LoadContents(int32 creator_process_id) { } web_contents_->GetController().LoadURL( - url_, content::Referrer(), content::PAGE_TRANSITION_LINK, + url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); } diff --git a/extensions/browser/extension_host.cc b/extensions/browser/extension_host.cc index 3920e47..cd5970b 100644 --- a/extensions/browser/extension_host.cc +++ b/extensions/browser/extension_host.cc @@ -200,7 +200,7 @@ const GURL& ExtensionHost::GetURL() const { void ExtensionHost::LoadInitialURL() { host_contents_->GetController().LoadURL( - initial_url_, content::Referrer(), content::PAGE_TRANSITION_LINK, + initial_url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); } diff --git a/extensions/browser/guest_view/app_view/app_view_guest.cc b/extensions/browser/guest_view/app_view/app_view_guest.cc index d3a40ec..ec14cc8 100644 --- a/extensions/browser/guest_view/app_view/app_view_guest.cc +++ b/extensions/browser/guest_view/app_view/app_view_guest.cc @@ -203,7 +203,7 @@ void AppViewGuest::DidAttachToEmbedder() { // events to the guest, and the guest knows how to get frames to the // embedder. web_contents()->GetController().LoadURL( - url_, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); + url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); } void AppViewGuest::DidInitialize() { diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc index a5e9399..759e48d 100644 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc @@ -109,7 +109,7 @@ void ExtensionOptionsGuest::DidAttachToEmbedder() { SetUpAutoSize(); web_contents()->GetController().LoadURL(options_page_, content::Referrer(), - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, std::string()); } @@ -211,7 +211,7 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents( content::OpenURLParams(target_url, content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, + ui::PAGE_TRANSITION_LINK, false)); } return false; diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc index 19cc7c5..9e09412 100644 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc @@ -109,7 +109,7 @@ void MimeHandlerViewGuest::DidAttachToEmbedder() { web_contents()->GetController().LoadURL( GURL(src), content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } 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 112c882..d7afe16 100644 --- a/extensions/browser/guest_view/web_view/web_view_guest.cc +++ b/extensions/browser/guest_view/web_view/web_view_guest.cc @@ -629,7 +629,7 @@ WebViewGuest::~WebViewGuest() { void WebViewGuest::DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) { + ui::PageTransition transition_type) { scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetString(guestview::kUrl, url.spec()); args->SetBoolean(guestview::kIsTopLevel, !render_frame_host->GetParent()); @@ -869,7 +869,7 @@ void WebViewGuest::NavigateGuest(const std::string& src) { // can be granted to the guest process. LoadURLWithParams(validated_url, content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, web_contents()); } @@ -1015,7 +1015,7 @@ void WebViewGuest::WebContentsCreated(WebContents* source_contents, void WebViewGuest::LoadURLWithParams(const GURL& url, const content::Referrer& referrer, - content::PageTransition transition_type, + ui::PageTransition transition_type, content::WebContents* web_contents) { content::NavigationController::LoadURLParams load_url_params(url); load_url_params.referrer = referrer; diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h index 7a54295..e62629b 100644 --- a/extensions/browser/guest_view/web_view/web_view_guest.h +++ b/extensions/browser/guest_view/web_view/web_view_guest.h @@ -246,7 +246,7 @@ class WebViewGuest : public GuestView<WebViewGuest>, virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - content::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) OVERRIDE; virtual void DidFailProvisionalLoad( content::RenderFrameHost* render_frame_host, const GURL& validated_url, @@ -282,7 +282,7 @@ class WebViewGuest : public GuestView<WebViewGuest>, void LoadURLWithParams(const GURL& url, const content::Referrer& referrer, - content::PageTransition transition_type, + ui::PageTransition transition_type, content::WebContents* web_contents); void RequestNewWindowPermission( diff --git a/extensions/browser/url_request_util.cc b/extensions/browser/url_request_util.cc index 7beb25a..3a271fa 100644 --- a/extensions/browser/url_request_util.cc +++ b/extensions/browser/url_request_util.cc @@ -46,7 +46,7 @@ bool AllowCrossRendererResourceLoad(net::URLRequest* request, return true; } - if (!content::PageTransitionIsWebTriggerable(info->GetPageTransition())) { + if (!ui::PageTransitionIsWebTriggerable(info->GetPageTransition())) { *allowed = false; return true; } diff --git a/extensions/shell/renderer/shell_content_renderer_client.cc b/extensions/shell/renderer/shell_content_renderer_client.cc index bca7dca..8a7e3ab 100644 --- a/extensions/shell/renderer/shell_content_renderer_client.cc +++ b/extensions/shell/renderer/shell_content_renderer_client.cc @@ -131,7 +131,7 @@ blink::WebPlugin* ShellContentRendererClient::CreatePluginReplacement( bool ShellContentRendererClient::WillSendRequest( blink::WebFrame* frame, - content::PageTransition transition_type, + ui::PageTransition transition_type, const GURL& url, const GURL& first_party_for_cookies, GURL* new_url) { diff --git a/extensions/shell/renderer/shell_content_renderer_client.h b/extensions/shell/renderer/shell_content_renderer_client.h index d9c4197..c040e8e 100644 --- a/extensions/shell/renderer/shell_content_renderer_client.h +++ b/extensions/shell/renderer/shell_content_renderer_client.h @@ -36,7 +36,7 @@ class ShellContentRendererClient : public content::ContentRendererClient { content::RenderFrame* render_frame, const base::FilePath& plugin_path) OVERRIDE; virtual bool WillSendRequest(blink::WebFrame* frame, - content::PageTransition transition_type, + ui::PageTransition transition_type, const GURL& url, const GURL& first_party_for_cookies, GURL* new_url) OVERRIDE; diff --git a/sync/protocol/sync_enums.proto b/sync/protocol/sync_enums.proto index 9ee2a9c..ec1ee65 100644 --- a/sync/protocol/sync_enums.proto +++ b/sync/protocol/sync_enums.proto @@ -45,9 +45,8 @@ message SyncEnums { // generated. } - // See content/public/common/page_transition_types.h for detailed - // information on the values of PageTransition and - // PageTransitionRedirectType below. + // See ui/base/page_transition_types.h for detailed information on the + // values of PageTransition and PageTransitionRedirectType below. // Types of transitions between pages. enum PageTransition { diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn index e1774d5..4f3a706 100644 --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn @@ -13,6 +13,16 @@ java_cpp_enum("java_enums_srcjar") { ] } +java_cpp_template("page_transition_types_srcjar") { + package_name = "org/chromium/ui/base" + sources = [ + "java/PageTransitionTypes.template", + ] + inputs = [ + "../base/page_transition_types_list.h", + ] +} + java_strings_grd("ui_strings_grd") { grd_file = "java/strings/android_ui_strings.grd" outputs = [ @@ -113,5 +123,6 @@ android_library("ui_java") { ] srcjar_deps = [ ":java_enums_srcjar", + ":page_transition_types_srcjar", ] } diff --git a/content/public/android/java/src/org/chromium/content_public/browser/PageTransitionTypes.template b/ui/android/java/PageTransitionTypes.template index 513331a..d2f12f8 100644 --- a/content/public/android/java/src/org/chromium/content_public/browser/PageTransitionTypes.template +++ b/ui/android/java/PageTransitionTypes.template @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.content_public.browser; +package org.chromium.ui.base; public class PageTransitionTypes { #define PAGE_TRANSITION(label, value) public static final int \ PAGE_TRANSITION_ ## label = value; -#include "content/public/common/page_transition_types_list.h" +#include "ui/base/page_transition_types_list.h" #undef PAGE_TRANSITION } diff --git a/ui/android/ui_android.gyp b/ui/android/ui_android.gyp index 5b8a786..bb0d0f5 100644 --- a/ui/android/ui_android.gyp +++ b/ui/android/ui_android.gyp @@ -16,6 +16,18 @@ 'includes': [ '../../build/android/java_cpp_enum.gypi' ], }, { + 'target_name': 'page_transition_types_java', + 'type': 'none', + 'sources': [ + 'java/PageTransitionTypes.template', + ], + 'variables': { + 'package_name': 'org/chromium/ui/base', + 'template_deps': ['../base/page_transition_types_list.h'], + }, + 'includes': [ '../../build/android/java_cpp_template.gypi' ], + }, + { 'target_name': 'window_open_disposition_java', 'type': 'none', 'variables': { @@ -35,6 +47,7 @@ 'dependencies': [ '../../base/base.gyp:base_java', 'bitmap_format_java', + 'page_transition_types_java', 'ui_strings_grd', 'window_open_disposition_java', ], diff --git a/ui/app_list/demo/app_list_demo_views.cc b/ui/app_list/demo/app_list_demo_views.cc index 71a2251..58e939a 100644 --- a/ui/app_list/demo/app_list_demo_views.cc +++ b/ui/app_list/demo/app_list_demo_views.cc @@ -97,7 +97,7 @@ views::View* DemoAppListViewDelegate::CreateStartPageWebView( content::WebContents::CreateParams(browser_context_))); web_contents_->GetController().LoadURL(GURL("http://www.google.com/"), content::Referrer(), - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); views::WebView* web_view = new views::WebView( web_contents_->GetBrowserContext()); diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index e41abf6..2ac985f 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -187,6 +187,9 @@ component("base") { "models/tree_node_model.h", "nine_image_painter_factory.cc", "nine_image_painter_factory.h", + "page_transition_types.cc", + "page_transition_types.h", + "page_transition_types_list.h", "resource/data_pack.cc", "resource/data_pack.h", "resource/resource_bundle.cc", diff --git a/content/public/common/page_transition_types.cc b/ui/base/page_transition_types.cc index bf95ea0..0bd86f6 100644 --- a/content/public/common/page_transition_types.cc +++ b/ui/base/page_transition_types.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/public/common/page_transition_types.h" +#include "ui/base/page_transition_types.h" #include "base/logging.h" -namespace content { +namespace ui { bool PageTransitionCoreTypeIs(PageTransition lhs, PageTransition rhs) { @@ -49,7 +49,7 @@ bool PageTransitionIsRedirect(PageTransition type) { bool PageTransitionIsNewNavigation(PageTransition type) { return (type & PAGE_TRANSITION_FORWARD_BACK) == 0 && - !PageTransitionCoreTypeIs(type, content::PAGE_TRANSITION_RELOAD); + !PageTransitionCoreTypeIs(type, PAGE_TRANSITION_RELOAD); } int32 PageTransitionGetQualifier(PageTransition type) { @@ -86,4 +86,4 @@ const char* PageTransitionGetCoreTransitionString(PageTransition type) { return NULL; } -} // namespace content +} // namespace ui diff --git a/content/public/common/page_transition_types.h b/ui/base/page_transition_types.h index 1b1f801..3ca67c5 100644 --- a/content/public/common/page_transition_types.h +++ b/ui/base/page_transition_types.h @@ -2,55 +2,55 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_PUBLIC_COMMON_PAGE_TRANSITION_TYPES_H_ -#define CONTENT_PUBLIC_COMMON_PAGE_TRANSITION_TYPES_H_ +#ifndef UI_BASE_PAGE_TRANSITION_TYPES_H_ +#define UI_BASE_PAGE_TRANSITION_TYPES_H_ #include "base/basictypes.h" -#include "content/common/content_export.h" +#include "ui/base/ui_base_export.h" -namespace content { +namespace ui { enum PageTransition { #define PAGE_TRANSITION(label, value) PAGE_TRANSITION_ ## label = value, -#include "content/public/common/page_transition_types_list.h" +#include "ui/base/page_transition_types_list.h" #undef PAGE_TRANSITION }; // Compares two PageTransition types ignoring qualifiers. |rhs| is taken to // be a compile time constant, and hence must not contain any qualifiers. -CONTENT_EXPORT bool PageTransitionCoreTypeIs(PageTransition lhs, +UI_BASE_EXPORT bool PageTransitionCoreTypeIs(PageTransition lhs, PageTransition rhs); // Simplifies the provided transition by removing any qualifier -CONTENT_EXPORT PageTransition PageTransitionStripQualifier( +UI_BASE_EXPORT PageTransition PageTransitionStripQualifier( PageTransition type); bool PageTransitionIsValidType(int32 type); -CONTENT_EXPORT PageTransition PageTransitionFromInt(int32 type); +UI_BASE_EXPORT PageTransition PageTransitionFromInt(int32 type); // Returns true if the given transition is a top-level frame transition, or // false if the transition was for a subframe. -CONTENT_EXPORT bool PageTransitionIsMainFrame(PageTransition type); +UI_BASE_EXPORT bool PageTransitionIsMainFrame(PageTransition type); // Returns whether a transition involves a redirection -CONTENT_EXPORT bool PageTransitionIsRedirect(PageTransition type); +UI_BASE_EXPORT bool PageTransitionIsRedirect(PageTransition type); // Returns whether a transition is a new navigation (rather than a return // to a previously committed navigation). -CONTENT_EXPORT bool PageTransitionIsNewNavigation(PageTransition type); +UI_BASE_EXPORT bool PageTransitionIsNewNavigation(PageTransition type); // Return the qualifier -CONTENT_EXPORT int32 PageTransitionGetQualifier(PageTransition type); +UI_BASE_EXPORT int32 PageTransitionGetQualifier(PageTransition type); // Returns true if the transition can be triggered by the web instead of // through UI or similar. -CONTENT_EXPORT bool PageTransitionIsWebTriggerable(PageTransition type); +UI_BASE_EXPORT bool PageTransitionIsWebTriggerable(PageTransition type); // Return a string version of the core type values. -CONTENT_EXPORT const char* PageTransitionGetCoreTransitionString( +UI_BASE_EXPORT const char* PageTransitionGetCoreTransitionString( PageTransition type); // TODO(joth): Remove the #if guard here; requires all chrome layer code to @@ -66,6 +66,6 @@ DontUseOperatorEquals operator==(PageTransition, int); DontUseOperatorEquals operator==(int, PageTransition); #endif // defined(CONTENT_IMPLEMENTATION) -} // namespace content +} // namespace ui -#endif // CONTENT_PUBLIC_COMMON_PAGE_TRANSITION_TYPES_H_ +#endif // UI_BASE_PAGE_TRANSITION_TYPES_H_ diff --git a/content/public/common/page_transition_types_list.h b/ui/base/page_transition_types_list.h index be67334..be67334 100644 --- a/content/public/common/page_transition_types_list.h +++ b/ui/base/page_transition_types_list.h diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp index d2abb03..96cb8d9 100644 --- a/ui/base/ui_base.gyp +++ b/ui/base/ui_base.gyp @@ -290,6 +290,9 @@ 'models/tree_node_model.h', 'nine_image_painter_factory.cc', 'nine_image_painter_factory.h', + 'page_transition_types.cc', + 'page_transition_types.h', + 'page_transition_types_list.h', 'resource/data_pack.cc', 'resource/data_pack.h', 'resource/resource_bundle.cc', diff --git a/ui/keyboard/keyboard_controller_proxy.cc b/ui/keyboard/keyboard_controller_proxy.cc index 097b0d62..1b3e86a 100644 --- a/ui/keyboard/keyboard_controller_proxy.cc +++ b/ui/keyboard/keyboard_controller_proxy.cc @@ -106,7 +106,7 @@ void KeyboardControllerProxy::LoadContents(const GURL& url) { url, content::Referrer(), SINGLETON_TAB, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false); keyboard_contents_->OpenURL(params); } diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc index e788500..f1f12d0 100644 --- a/ui/views/controls/webview/webview.cc +++ b/ui/views/controls/webview/webview.cc @@ -80,7 +80,7 @@ void WebView::SetEmbedFullscreenWidgetMode(bool enable) { void WebView::LoadInitialURL(const GURL& url) { GetWebContents()->GetController().LoadURL( - url, content::Referrer(), content::PAGE_TRANSITION_AUTO_TOPLEVEL, + url, content::Referrer(), ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); } |