summaryrefslogtreecommitdiffstats
path: root/extensions
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
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')
-rw-r--r--extensions/browser/app_window/app_window_contents.cc2
-rw-r--r--extensions/browser/extension_host.cc2
-rw-r--r--extensions/browser/guest_view/app_view/app_view_guest.cc2
-rw-r--r--extensions/browser/guest_view/extension_options/extension_options_guest.cc4
-rw-r--r--extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc2
-rw-r--r--extensions/browser/guest_view/web_view/web_view_guest.cc6
-rw-r--r--extensions/browser/guest_view/web_view/web_view_guest.h4
-rw-r--r--extensions/browser/url_request_util.cc2
-rw-r--r--extensions/shell/renderer/shell_content_renderer_client.cc2
-rw-r--r--extensions/shell/renderer/shell_content_renderer_client.h2
10 files changed, 14 insertions, 14 deletions
diff --git a/extensions/browser/app_window/app_window_contents.cc b/extensions/browser/app_window/app_window_contents.cc
index 9f0425a..6c3909a 100644
--- a/extensions/browser/app_window/app_window_contents.cc
+++ b/extensions/browser/app_window/app_window_contents.cc
@@ -56,7 +56,7 @@ void AppWindowContentsImpl::LoadContents(int32 creator_process_id) {
}
web_contents_->GetController().LoadURL(
- url_, content::Referrer(), content::PAGE_TRANSITION_LINK,
+ url_, content::Referrer(), ui::PAGE_TRANSITION_LINK,
std::string());
}
diff --git a/extensions/browser/extension_host.cc b/extensions/browser/extension_host.cc
index 3920e47..cd5970b 100644
--- a/extensions/browser/extension_host.cc
+++ b/extensions/browser/extension_host.cc
@@ -200,7 +200,7 @@ const GURL& ExtensionHost::GetURL() const {
void ExtensionHost::LoadInitialURL() {
host_contents_->GetController().LoadURL(
- initial_url_, content::Referrer(), content::PAGE_TRANSITION_LINK,
+ initial_url_, content::Referrer(), ui::PAGE_TRANSITION_LINK,
std::string());
}
diff --git a/extensions/browser/guest_view/app_view/app_view_guest.cc b/extensions/browser/guest_view/app_view/app_view_guest.cc
index d3a40ec..ec14cc8 100644
--- a/extensions/browser/guest_view/app_view/app_view_guest.cc
+++ b/extensions/browser/guest_view/app_view/app_view_guest.cc
@@ -203,7 +203,7 @@ void AppViewGuest::DidAttachToEmbedder() {
// events to the guest, and the guest knows how to get frames to the
// embedder.
web_contents()->GetController().LoadURL(
- url_, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
+ url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
}
void AppViewGuest::DidInitialize() {
diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
index a5e9399..759e48d 100644
--- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
+++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
@@ -109,7 +109,7 @@ void ExtensionOptionsGuest::DidAttachToEmbedder() {
SetUpAutoSize();
web_contents()->GetController().LoadURL(options_page_,
content::Referrer(),
- content::PAGE_TRANSITION_LINK,
+ ui::PAGE_TRANSITION_LINK,
std::string());
}
@@ -211,7 +211,7 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents(
content::OpenURLParams(target_url,
content::Referrer(),
NEW_FOREGROUND_TAB,
- content::PAGE_TRANSITION_LINK,
+ ui::PAGE_TRANSITION_LINK,
false));
}
return false;
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index 19cc7c5..9e09412 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -109,7 +109,7 @@ void MimeHandlerViewGuest::DidAttachToEmbedder() {
web_contents()->GetController().LoadURL(
GURL(src),
content::Referrer(),
- content::PAGE_TRANSITION_AUTO_TOPLEVEL,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
std::string());
}
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index 112c882..d7afe16 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -629,7 +629,7 @@ WebViewGuest::~WebViewGuest() {
void WebViewGuest::DidCommitProvisionalLoadForFrame(
content::RenderFrameHost* render_frame_host,
const GURL& url,
- content::PageTransition transition_type) {
+ ui::PageTransition transition_type) {
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
args->SetString(guestview::kUrl, url.spec());
args->SetBoolean(guestview::kIsTopLevel, !render_frame_host->GetParent());
@@ -869,7 +869,7 @@ void WebViewGuest::NavigateGuest(const std::string& src) {
// can be granted to the guest process.
LoadURLWithParams(validated_url,
content::Referrer(),
- content::PAGE_TRANSITION_AUTO_TOPLEVEL,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
web_contents());
}
@@ -1015,7 +1015,7 @@ void WebViewGuest::WebContentsCreated(WebContents* source_contents,
void WebViewGuest::LoadURLWithParams(const GURL& url,
const content::Referrer& referrer,
- content::PageTransition transition_type,
+ ui::PageTransition transition_type,
content::WebContents* web_contents) {
content::NavigationController::LoadURLParams load_url_params(url);
load_url_params.referrer = referrer;
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h
index 7a54295..e62629b 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.h
+++ b/extensions/browser/guest_view/web_view/web_view_guest.h
@@ -246,7 +246,7 @@ class WebViewGuest : public GuestView<WebViewGuest>,
virtual void DidCommitProvisionalLoadForFrame(
content::RenderFrameHost* render_frame_host,
const GURL& url,
- content::PageTransition transition_type) OVERRIDE;
+ ui::PageTransition transition_type) OVERRIDE;
virtual void DidFailProvisionalLoad(
content::RenderFrameHost* render_frame_host,
const GURL& validated_url,
@@ -282,7 +282,7 @@ class WebViewGuest : public GuestView<WebViewGuest>,
void LoadURLWithParams(const GURL& url,
const content::Referrer& referrer,
- content::PageTransition transition_type,
+ ui::PageTransition transition_type,
content::WebContents* web_contents);
void RequestNewWindowPermission(
diff --git a/extensions/browser/url_request_util.cc b/extensions/browser/url_request_util.cc
index 7beb25a..3a271fa 100644
--- a/extensions/browser/url_request_util.cc
+++ b/extensions/browser/url_request_util.cc
@@ -46,7 +46,7 @@ bool AllowCrossRendererResourceLoad(net::URLRequest* request,
return true;
}
- if (!content::PageTransitionIsWebTriggerable(info->GetPageTransition())) {
+ if (!ui::PageTransitionIsWebTriggerable(info->GetPageTransition())) {
*allowed = false;
return true;
}
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;