chrome/browser/history/shortcuts_database.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/history/shortcuts_database.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/history/scored_history_match_unittest.cc ('k') | chrome/browser/history/shortcuts_database_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/shortcuts_database.cc

diff --git a/chrome/browser/history/shortcuts_database.cc b/chrome/browser/history/shortcuts_database.cc

index 3094b58005620c369b68b844a126504e51e3110f..ec4c0973afafb8c33bc4872331525818132a6dd6 100644

--- a/chrome/browser/history/shortcuts_database.cc

+++ b/chrome/browser/history/shortcuts_database.cc

@@ -11,10 +11,10 @@

#include "base/strings/stringprintf.h"

#include "base/time/time.h"

#include "components/omnibox/autocomplete_match_type.h"

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

#include "sql/meta_table.h"

#include "sql/statement.h"

#include "sql/transaction.h"

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

// Helpers --------------------------------------------------------------------

@@ -243,7 +243,7 @@ bool ShortcutsDatabase::EnsureTable() {

"ADD COLUMN transition INTEGER") &&

db_.Execute(base::StringPrintf(

"UPDATE omni_box_shortcuts SET transition = %d",

- static_cast<int>(content::PAGE_TRANSITION_TYPED)).c_str()) &&

+ static_cast<int>(ui::PAGE_TRANSITION_TYPED)).c_str()) &&

db_.Execute("ALTER TABLE omni_box_shortcuts ADD COLUMN type INTEGER") &&

db_.Execute(base::StringPrintf(

"UPDATE omni_box_shortcuts SET type = %d",

« no previous file with comments | « chrome/browser/history/scored_history_match_unittest.cc ('k') | chrome/browser/history/shortcuts_database_unittest.cc » ('j') | no next file with comments »