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

Unified Diff: chrome/browser/ui/toolbar/toolbar_model_impl.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
Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
index af2de923ea2f4313f55c22a0adadbc42a3d14878..c80a147ba526bac036d30ee3b2f04ac3d9c4f9e3 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;
}
« no previous file with comments | « chrome/browser/ui/tabs/tab_strip_model_unittest.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698