Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6120)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/browser_browsertest.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_close_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index f8fbb05a5430dff9e412ffef7496d77b80439532..c86c59bdfcbdc0aad373ab85e5d57f215bf4a4b1 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(&params1);
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(&params2);
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(&params3);
EXPECT_EQ(app_popup_browser, params3.target);
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_close_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698