Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5640)

Unified Diff: chrome/browser/extensions/api/tabs/tabs_api.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
Index: chrome/browser/extensions/api/tabs/tabs_api.cc
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 6fc19f7cdef1e29dfa4ee88576f58e1d2c908750..2f2ce6c6ecde8687bb4e358f296f0d939280c5d9 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -559,7 +559,7 @@ bool WindowsCreateFunction::RunSync() {
for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i) {
WebContents* tab = chrome::AddSelectedTabWithURL(
- new_window, *i, content::PAGE_TRANSITION_LINK);
+ new_window, *i, ui::PAGE_TRANSITION_LINK);
if (create_panel) {
TabHelper::FromWebContents(tab)->SetExtensionAppIconById(extension_id);
}
@@ -1250,7 +1250,7 @@ bool TabsUpdateFunction::UpdateURL(const std::string &url_string,
}
web_contents_->GetController().LoadURL(
- url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
+ url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
// The URL of a tab contents never actually changes to a JavaScript URL, so
// this check only makes sense in other cases.
@@ -1466,7 +1466,7 @@ bool TabsReloadFunction::RunSync() {
// This does as same as Browser::ReloadInternal.
NavigationEntry* entry = web_contents->GetController().GetVisibleEntry();
OpenURLParams params(entry->GetURL(), Referrer(), CURRENT_TAB,
- content::PAGE_TRANSITION_RELOAD, false);
+ ui::PAGE_TRANSITION_RELOAD, false);
GetCurrentBrowser()->OpenURL(params);
} else if (bypass_cache) {
web_contents->GetController().ReloadIgnoringCache(true);
« no previous file with comments | « chrome/browser/extensions/api/tabs/ash_panel_contents.cc ('k') | chrome/browser/extensions/api/tabs/tabs_interactive_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698