summaryrefslogtreecommitdiffstats
path: root/extensions/shell/renderer
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 /extensions/shell/renderer
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 'extensions/shell/renderer')
-rw-r--r--extensions/shell/renderer/shell_content_renderer_client.cc2
-rw-r--r--extensions/shell/renderer/shell_content_renderer_client.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/shell/renderer/shell_content_renderer_client.cc b/extensions/shell/renderer/shell_content_renderer_client.cc
index bca7dca..8a7e3ab 100644
--- a/extensions/shell/renderer/shell_content_renderer_client.cc
+++ b/extensions/shell/renderer/shell_content_renderer_client.cc
@@ -131,7 +131,7 @@ blink::WebPlugin* ShellContentRendererClient::CreatePluginReplacement(
bool ShellContentRendererClient::WillSendRequest(
blink::WebFrame* frame,
- content::PageTransition transition_type,
+ ui::PageTransition transition_type,
const GURL& url,
const GURL& first_party_for_cookies,
GURL* new_url) {
diff --git a/extensions/shell/renderer/shell_content_renderer_client.h b/extensions/shell/renderer/shell_content_renderer_client.h
index d9c4197..c040e8e 100644
--- a/extensions/shell/renderer/shell_content_renderer_client.h
+++ b/extensions/shell/renderer/shell_content_renderer_client.h
@@ -36,7 +36,7 @@ class ShellContentRendererClient : public content::ContentRendererClient {
content::RenderFrame* render_frame,
const base::FilePath& plugin_path) OVERRIDE;
virtual bool WillSendRequest(blink::WebFrame* frame,
- content::PageTransition transition_type,
+ ui::PageTransition transition_type,
const GURL& url,
const GURL& first_party_for_cookies,
GURL* new_url) OVERRIDE;