summaryrefslogtreecommitdiffstats
path: root/chrome/browser/devtools
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 /chrome/browser/devtools
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 'chrome/browser/devtools')
-rw-r--r--chrome/browser/devtools/browser_list_tabcontents_provider.cc2
-rw-r--r--chrome/browser/devtools/devtools_ui_bindings.cc4
-rw-r--r--chrome/browser/devtools/devtools_window.cc8
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
index dcc7157..4ddb06f 100644
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
@@ -103,7 +103,7 @@ std::string BrowserListTabContentsProvider::GetPageThumbnailData(
scoped_ptr<DevToolsTarget>
BrowserListTabContentsProvider::CreateNewTarget(const GURL& url) {
chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(),
- url, content::PAGE_TRANSITION_AUTO_TOPLEVEL);
+ url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
params.disposition = NEW_FOREGROUND_TAB;
chrome::Navigate(&params);
if (!params.target_contents)
diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc
index 5dafffb..c7d11cd 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.cc
+++ b/chrome/browser/devtools/devtools_ui_bindings.cc
@@ -43,13 +43,13 @@
#include "content/public/browser/user_metrics.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/common/renderer_preferences.h"
#include "content/public/common/url_constants.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension_set.h"
#include "extensions/common/permissions/permissions_data.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/page_transition_types.h"
using base::DictionaryValue;
using content::BrowserThread;
@@ -208,7 +208,7 @@ void DefaultBindingsDelegate::ActivateWindow() {
void DefaultBindingsDelegate::OpenInNewTab(const std::string& url) {
content::OpenURLParams params(
GURL(url), content::Referrer(), NEW_FOREGROUND_TAB,
- content::PAGE_TRANSITION_LINK, false);
+ ui::PAGE_TRANSITION_LINK, false);
Browser* browser = FindBrowser(web_contents_);
browser->OpenURL(params);
}
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 78e75f4..072b1e8 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -44,9 +44,9 @@
#include "content/public/browser/user_metrics.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_client.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/common/url_constants.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/base/page_transition_types.h"
#include "ui/events/keycodes/keyboard_codes.h"
using base::DictionaryValue;
@@ -684,7 +684,7 @@ DevToolsWindow::DevToolsWindow(Profile* profile,
main_web_contents_->GetController().LoadURL(
DevToolsUIBindings::ApplyThemeToURL(profile, url), content::Referrer(),
- content::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
bindings_ = DevToolsUIBindings::ForWebContents(main_web_contents_);
DCHECK(bindings_);
@@ -1044,7 +1044,7 @@ void DevToolsWindow::SetIsDocked(bool dock_requested) {
void DevToolsWindow::OpenInNewTab(const std::string& url) {
content::OpenURLParams params(
GURL(url), content::Referrer(), NEW_FOREGROUND_TAB,
- content::PAGE_TRANSITION_LINK, false);
+ ui::PAGE_TRANSITION_LINK, false);
WebContents* inspected_web_contents = GetInspectedWebContents();
if (inspected_web_contents) {
inspected_web_contents->OpenURL(params);
@@ -1142,7 +1142,7 @@ void DevToolsWindow::CreateDevToolsBrowser() {
chrome::GetHostDesktopTypeForNativeView(
main_web_contents_->GetNativeView())));
browser_->tab_strip_model()->AddWebContents(
- main_web_contents_, -1, content::PAGE_TRANSITION_AUTO_TOPLEVEL,
+ main_web_contents_, -1, ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
TabStripModel::ADD_ACTIVE);
main_web_contents_->GetRenderViewHost()->SyncRendererPrefs();
}