summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorSylvain Defresne <sdefresne@chromium.org>2014-09-19 12:19:35 +0200
committerSylvain Defresne <sdefresne@chromium.org>2014-09-19 10:20:45 +0000
commitc6ccc77dc9c080d83e400dc12205bb805a25ac71 (patch)
tree8050f444606ddb8eae0297b52676cb2e01e6f8db /apps
parent80ced42d624a1eec8e8a2f0c0c760ab576d65ead (diff)
downloadchromium_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 'apps')
-rw-r--r--apps/custom_launcher_page_contents.cc2
1 files changed, 1 insertions, 1 deletions
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());
}