diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 03:51:58 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 03:51:58 +0000 |
| commit | 2905f74ce902dbf21dcbbf7ed3537f803f027630 (patch) | |
| tree | 0371f49d1768902bf69e0130b55ec104258f5cf9 /chrome/browser/debugger | |
| parent | 49098f7091448e437190f23cc67a705df4abd079 (diff) | |
| download | chromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.zip chromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.tar.gz chromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.tar.bz2 | |
Move PageTransition into content namespace. While I'm touching all these files, I've also updated it to use the enum naming convention in the Content API.
BUG=98716
Review URL: http://codereview.chromium.org/8253002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
| -rw-r--r-- | chrome/browser/debugger/devtools_window.cc | 18 | ||||
| -rw-r--r-- | chrome/browser/debugger/devtools_window.h | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index a71e4f0..241bc3e 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -126,7 +126,7 @@ DevToolsWindow* DevToolsWindow::Create( tab_contents->controller().LoadURL( GetDevToolsUrl(profile, docked, shared_worker_frontend), GURL(), - PageTransition::START_PAGE, + content::PAGE_TRANSITION_START_PAGE, std::string()); return new DevToolsWindow(tab_contents, profile, inspected_rvh, docked); } @@ -341,7 +341,8 @@ void DevToolsWindow::CreateDevToolsBrowser() { browser_ = Browser::CreateForDevTools(profile_); browser_->tabstrip_model()->AddTabContents( - tab_contents_, -1, PageTransition::START_PAGE, TabStripModel::ADD_ACTIVE); + tab_contents_, -1, content::PAGE_TRANSITION_START_PAGE, + TabStripModel::ADD_ACTIVE); } bool DevToolsWindow::FindInspectedBrowserAndTabIndex(Browser** browser, @@ -414,11 +415,12 @@ void DevToolsWindow::AddDevToolsExtensionsToClient() { } // TODO(adriansc): Remove this method once refactoring changed all call sites. -TabContents* DevToolsWindow::OpenURLFromTab(TabContents* source, - const GURL& url, - const GURL& referrer, - WindowOpenDisposition disposition, - PageTransition::Type transition) { +TabContents* DevToolsWindow::OpenURLFromTab( + TabContents* source, + const GURL& url, + const GURL& referrer, + WindowOpenDisposition disposition, + content::PageTransition transition) { return OpenURLFromTab(source, OpenURLParams(url, referrer, disposition, transition)); } @@ -428,7 +430,7 @@ TabContents* DevToolsWindow::OpenURLFromTab(TabContents* source, if (inspected_tab_) { OpenURLParams forward_params = params; forward_params.disposition = NEW_FOREGROUND_TAB; - forward_params.transition = PageTransition::LINK; + forward_params.transition = content::PAGE_TRANSITION_LINK; return inspected_tab_->tab_contents()->OpenURL(forward_params); } return NULL; diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h index 63c68f1..d60d88b 100644 --- a/chrome/browser/debugger/devtools_window.h +++ b/chrome/browser/debugger/devtools_window.h @@ -98,7 +98,7 @@ class DevToolsWindow const GURL& url, const GURL& referrer, WindowOpenDisposition disposition, - PageTransition::Type transition) OVERRIDE; + content::PageTransition transition) OVERRIDE; virtual TabContents* OpenURLFromTab(TabContents* source, const OpenURLParams& params) OVERRIDE; virtual void AddNewContents(TabContents* source, |