chrome/browser/ui/views/bookmarks/bookmark_bar_view.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/ui/views/bookmarks/bookmark_bar_view.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/ui/views/apps/app_info_dialog/app_info_header_panel.cc ('k') | chrome/browser/ui/views/conflicting_module_view_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

index 5271b0dd235777d817f039787352f113a15e8aa5..8b044e74a2fbd1ebe289ffa33a5ee6f75fd0f6d4 100644

--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

@@ -60,7 +60,6 @@

#include "content/public/browser/render_widget_host_view.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/browser/web_contents.h"

-#include "content/public/common/page_transition_types.h"

#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension.h"

#include "extensions/common/extension_set.h"

@@ -69,6 +68,7 @@

#include "ui/base/dragdrop/drag_utils.h"

#include "ui/base/dragdrop/os_exchange_data.h"

#include "ui/base/l10n/l10n_util.h"

+#include "ui/base/page_transition_types.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/theme_provider.h"

#include "ui/base/window_open_disposition.h"

@@ -1269,7 +1269,7 @@ void BookmarkBarView::ButtonPressed(views::Button* sender,

OpenURLParams params(GURL(chrome::kChromeUIAppsURL),

Referrer(),

disposition_from_event_flags,

- content::PAGE_TRANSITION_AUTO_BOOKMARK,

+ ui::PAGE_TRANSITION_AUTO_BOOKMARK,

false);

page_navigator_->OpenURL(params);

RecordBookmarkAppsPageOpen(GetBookmarkLaunchLocation());

@@ -1292,7 +1292,7 @@ void BookmarkBarView::ButtonPressed(views::Button* sender,

RecordAppLaunch(browser_->profile(), node->url());

OpenURLParams params(

node->url(), Referrer(), disposition_from_event_flags,

- content::PAGE_TRANSITION_AUTO_BOOKMARK, false);

+ ui::PAGE_TRANSITION_AUTO_BOOKMARK, false);

page_navigator_->OpenURL(params);

} else {

chrome::OpenAll(GetWidget()->GetNativeWindow(), page_navigator_, node,