diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 11:24:00 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 11:24:00 +0000 |
| commit | 3807b48f7b925983c8a145ee330df936b4b8c707 (patch) | |
| tree | e364564c3de196a33f33ba964c162c7d78ea3301 /chrome/browser/ui/browser.h | |
| parent | 3796751696cf767d3643cbdff3eddda174f30a0c (diff) | |
| download | chromium_src-3807b48f7b925983c8a145ee330df936b4b8c707.zip chromium_src-3807b48f7b925983c8a145ee330df936b4b8c707.tar.gz chromium_src-3807b48f7b925983c8a145ee330df936b4b8c707.tar.bz2 | |
Revert 106029
Broke http://build.chromium.org/p/chromium.perf/console
Move navigation_types.h from content/common to content/public/browser, and put it in the content namespace. There was no reason for it to be in common since it's only used by browser. I also updated the enum names to match the rest of the enums in the Content API.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8339006
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8333018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser.h')
| -rw-r--r-- | chrome/browser/ui/browser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index a0fdacc..cb5b348 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -958,7 +958,7 @@ class Browser : public TabHandlerDelegate, virtual void ShowRepostFormWarningDialog(TabContents* tab_contents) OVERRIDE; virtual bool ShouldAddNavigationToHistory( const history::HistoryAddPageArgs& add_page_args, - content::NavigationType navigation_type) OVERRIDE; + NavigationType::Type navigation_type) OVERRIDE; virtual void ContentRestrictionsChanged(TabContents* source) OVERRIDE; virtual void RendererUnresponsive(TabContents* source) OVERRIDE; virtual void RendererResponsive(TabContents* source) OVERRIDE; |