diff options
author | Sylvain Defresne <sdefresne@chromium.org> | 2014-09-19 12:19:35 +0200 |
---|---|---|
committer | Sylvain Defresne <sdefresne@chromium.org> | 2014-09-19 10:20:45 +0000 |
commit | c6ccc77dc9c080d83e400dc12205bb805a25ac71 (patch) | |
tree | 8050f444606ddb8eae0297b52676cb2e01e6f8db /chrome/browser/download | |
parent | 80ced42d624a1eec8e8a2f0c0c760ab576d65ead (diff) | |
download | chromium_src-c6ccc77dc9c080d83e400dc12205bb805a25ac71.zip chromium_src-c6ccc77dc9c080d83e400dc12205bb805a25ac71.tar.gz chromium_src-c6ccc77dc9c080d83e400dc12205bb805a25ac71.tar.bz2 |
Move PageTransition from //content/public/common to //ui/base
Move PageTransition enumeration from //content/public/common to //ui/base
so that it can be used by iOS and layered components that are used on iOS.
BUG=372373
R=avi@chromium.org, ben@chromium.org, wfh@chromium.org
TBR=ben, nasko
Review URL: https://codereview.chromium.org/562603002
Cr-Commit-Position: refs/heads/master@{#295686}
Diffstat (limited to 'chrome/browser/download')
7 files changed, 8 insertions, 8 deletions
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()) |