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

Unified Diff: chrome/browser/ui/browser.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.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 0525e02fffecdf9cef21665c93a8cabe13fb5940..e26600a37a2984b078107b89ddbb170d0a67b459 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.
}
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698