chrome/browser/devtools/devtools_window.cc - Issue 562603002: Move PageTransition from //content/public/common to //ui/base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/devtools/devtools_window.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

« no previous file with comments | « chrome/browser/devtools/devtools_ui_bindings.cc ('k') | chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/devtools/devtools_window.cc

diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc

index 78e75f4882a865c39600ecaff9374b965337ac7a..072b1e82c61168a7f94e4aa582d9d9afeab73c2f 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();

}