chrome/browser/ui/browser.cc - Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

Unified Diff: chrome/browser/ui/browser.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 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/ui/browser.cc

===================================================================

--- chrome/browser/ui/browser.cc (revision 105162)

+++ chrome/browser/ui/browser.cc (working copy)

@@ -149,7 +149,6 @@

#include "content/common/content_switches.h"

#include "content/common/notification_details.h"

#include "content/common/notification_service.h"

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

#include "content/common/page_zoom.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

@@ -556,7 +555,7 @@

void Browser::OpenURLOffTheRecord(Profile* profile, const GURL& url) {

Browser* browser = GetOrCreateTabbedBrowser(

profile->GetOffTheRecordProfile());

- browser->AddSelectedTabWithURL(url, PageTransition::LINK);

+ browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_LINK);

browser->window()->Show();

}

@@ -629,7 +628,7 @@

*app_browser = browser;

TabContentsWrapper* wrapper =

- browser->AddSelectedTabWithURL(url, PageTransition::START_PAGE);

+ browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_START_PAGE);

TabContents* contents = wrapper->tab_contents();

contents->GetMutableRendererPrefs()->can_accept_load_drops = false;

contents->render_view_host()->SyncRendererPrefs();

@@ -710,7 +709,7 @@

// TODO(erikkay): START_PAGE doesn't seem like the right transition in all

// cases.

browser::NavigateParams params(browser, extension_url,

- PageTransition::START_PAGE);

+ content::PAGE_TRANSITION_START_PAGE);

params.tabstrip_add_types = add_type;

params.disposition = disposition;

@@ -720,7 +719,7 @@

int tab_index = model->GetWrapperIndex(existing_tab);

existing_tab->OpenURL(extension->GetFullLaunchURL(), existing_tab->GetURL(),

- disposition, PageTransition::LINK);

+ disposition, content::PAGE_TRANSITION_LINK);

if (params.tabstrip_add_types & TabStripModel::ADD_PINNED) {

model->SetTabPinned(tab_index, true);

tab_index = model->GetWrapperIndex(existing_tab);

@@ -1099,7 +1098,7 @@

TabContentsWrapper* Browser::AddSelectedTabWithURL(

const GURL& url,

- PageTransition::Type transition) {

+ content::PageTransition transition) {

browser::NavigateParams params(this, url, transition);

params.disposition = NEW_FOREGROUND_TAB;

browser::Navigate(&params);

@@ -1107,7 +1106,7 @@

}

TabContents* Browser::AddTab(TabContentsWrapper* tab_contents,

- PageTransition::Type type) {

+ content::PageTransition type) {

tab_handler_->GetTabStripModel()->AddTabContents(

tab_contents, -1, type, TabStripModel::ADD_ACTIVE);

return tab_contents->tab_contents();

@@ -1247,7 +1246,8 @@

browser::NavigateParams Browser::GetSingletonTabNavigateParams(

const GURL& url) {

- browser::NavigateParams params(this, url, PageTransition::AUTO_BOOKMARK);

+ browser::NavigateParams params(

+ this, url, content::PAGE_TRANSITION_AUTO_BOOKMARK);

params.disposition = SINGLETON_TAB;

params.window_action = browser::NavigateParams::SHOW_WINDOW;

params.user_gesture = true;

@@ -1315,7 +1315,7 @@

case NEW_BACKGROUND_TAB: {

current_tab = current_tab->Clone();

tab_handler_->GetTabStripModel()->AddTabContents(

- current_tab, -1, PageTransition::LINK,

+ current_tab, -1, content::PAGE_TRANSITION_LINK,

disposition == NEW_FOREGROUND_TAB ? TabStripModel::ADD_ACTIVE :

TabStripModel::ADD_NONE);

break;

@@ -1324,7 +1324,8 @@

current_tab = current_tab->Clone();

Browser* browser = Browser::Create(profile_);

browser->tabstrip_model()->AddTabContents(

- current_tab, -1, PageTransition::LINK, TabStripModel::ADD_ACTIVE);

+ current_tab, -1, content::PAGE_TRANSITION_LINK,

+ TabStripModel::ADD_ACTIVE);

browser->window()->Show();

break;

}

@@ -1426,7 +1427,7 @@

if (current_tab && current_tab->showing_interstitial_page()) {

NavigationEntry* entry = current_tab->controller().GetActiveEntry();

DCHECK(entry); // Should exist if interstitial is showing.

- OpenURL(entry->url(), GURL(), disposition, PageTransition::RELOAD);

+ OpenURL(entry->url(), GURL(), disposition, content::PAGE_TRANSITION_RELOAD);

return;

}

@@ -1442,8 +1443,11 @@

void Browser::Home(WindowOpenDisposition disposition) {

UserMetrics::RecordAction(UserMetricsAction("Home"));

- OpenURL(GetHomePage(), GURL(), disposition,

- PageTransition::AUTO_BOOKMARK | PageTransition::HOME_PAGE);

+ OpenURL(

+ GetHomePage(), GURL(), disposition,

+ content::PageTransitionFromInt(

+ content::PAGE_TRANSITION_AUTO_BOOKMARK |

+ content::PAGE_TRANSITION_HOME_PAGE));

}

void Browser::OpenCurrentURL() {

@@ -2118,13 +2122,13 @@

void Browser::OpenPrivacyDashboardTabAndActivate() {

OpenURL(GURL(kPrivacyDashboardUrl), GURL(),

- NEW_FOREGROUND_TAB, PageTransition::LINK);

+ NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);

window_->Activate();

}

void Browser::OpenAutofillHelpTabAndActivate() {

GURL help_url = google_util::AppendGoogleLocaleParam(GURL(kAutofillHelpUrl));

- AddSelectedTabWithURL(help_url, PageTransition::LINK);

+ AddSelectedTabWithURL(help_url, content::PAGE_TRANSITION_LINK);

}

void Browser::OpenSearchEngineOptionsDialog() {

@@ -2157,20 +2161,20 @@

void Browser::OpenSystemTabAndActivate() {

OpenURL(GURL(chrome::kChromeUISystemInfoURL), GURL(),

- NEW_FOREGROUND_TAB, PageTransition::LINK);

+ NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);

window_->Activate();

}

void Browser::OpenMobilePlanTabAndActivate() {

OpenURL(GURL(chrome::kChromeUIMobileSetupURL), GURL(),

- NEW_FOREGROUND_TAB, PageTransition::LINK);

+ NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);

window_->Activate();

}

#endif

void Browser::OpenPluginsTabAndActivate() {

OpenURL(GURL(chrome::kChromeUIPluginsURL), GURL(),

- NEW_FOREGROUND_TAB, PageTransition::LINK);

+ NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);

window_->Activate();

}

@@ -2804,7 +2808,7 @@

}

void Browser::UpdateUIForNavigationInTab(TabContentsWrapper* contents,

- PageTransition::Type transition,

+ content::PageTransition transition,

bool user_initiated) {

tabstrip_model()->TabNavigating(contents, transition);

@@ -2865,7 +2869,7 @@

TabContents* Browser::OpenURL(const GURL& url,

const GURL& referrer,

WindowOpenDisposition disposition,

- PageTransition::Type transition) {

+ content::PageTransition transition) {

return OpenURLFromTab(NULL,

OpenURLParams(url, referrer, disposition, transition));

}

@@ -2908,7 +2912,7 @@

// TabContents object too.

base::TimeTicks new_tab_start_time = base::TimeTicks::Now();

browser::NavigateParams params(this, GURL(chrome::kChromeUINewTabURL),

- PageTransition::TYPED);

+ content::PAGE_TRANSITION_TYPED);

params.disposition = foreground ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;

params.tabstrip_index = index;

browser::Navigate(&params);

@@ -2948,7 +2952,7 @@

TabContentsWrapper* Browser::CreateTabContentsForURL(

const GURL& url, const GURL& referrer, Profile* profile,

- PageTransition::Type transition, bool defer_load,

+ content::PageTransition transition, bool defer_load,

SiteInstance* instance) const {

TabContentsWrapper* contents = TabContentsFactory(profile, instance,

MSG_ROUTING_NONE,

@@ -3007,7 +3011,7 @@

browser->window()->Show();

// The page transition below is only for the purpose of inserting the tab.

- browser->AddTab(contents_dupe, PageTransition::LINK);

+ browser->AddTab(contents_dupe, content::PAGE_TRANSITION_LINK);

}

SessionService* session_service =

@@ -3291,7 +3295,7 @@

const GURL& url,

const GURL& referrer,

WindowOpenDisposition disposition,

- PageTransition::Type transition) {

+ content::PageTransition transition) {

return OpenURLFromTab(source, OpenURLParams(url, referrer, disposition,

transition));

}

@@ -3949,7 +3953,7 @@

profile_->set_last_selected_directory(path.DirName());

GURL file_url = net::FilePathToFileURL(path);

if (!file_url.is_empty())

- OpenURL(file_url, GURL(), CURRENT_TAB, PageTransition::TYPED);

+ OpenURL(file_url, GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED);

}

///////////////////////////////////////////////////////////////////////////////

@@ -5183,7 +5187,7 @@

browser->window()->Show();

// The page transition below is only for the purpose of inserting the tab.

- browser->AddTab(view_source_contents, PageTransition::LINK);

+ browser->AddTab(view_source_contents, content::PAGE_TRANSITION_LINK);

}

SessionService* session_service =

« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »