diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-15 03:25:11 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-15 03:25:11 +0000 |
commit | 7f0005ab19ca4e374029180753c32e4c9813303a (patch) | |
tree | f36e756a90ff4324530789c89aef6a2e2f3573b5 /chrome/browser/browser_url_handler.cc | |
parent | b237407befc41c3a19c7519523b102808213b49b (diff) | |
download | chromium_src-7f0005ab19ca4e374029180753c32e4c9813303a.zip chromium_src-7f0005ab19ca4e374029180753c32e4c9813303a.tar.gz chromium_src-7f0005ab19ca4e374029180753c32e4c9813303a.tar.bz2 |
Remove TabContentsType from the NavigationController external interface and in
some related areas. I removed all uses of this in the previous patch.
Review URL: http://codereview.chromium.org/73057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_url_handler.cc')
-rw-r--r-- | chrome/browser/browser_url_handler.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/chrome/browser/browser_url_handler.cc b/chrome/browser/browser_url_handler.cc index 4da1daf..c309c01 100644 --- a/chrome/browser/browser_url_handler.cc +++ b/chrome/browser/browser_url_handler.cc @@ -11,22 +11,19 @@ #include "googleurl/src/gurl.h" // Handles rewriting view-source URLs for what we'll actually load. -static bool HandleViewSource(GURL* url, TabContentsType* type) { +static bool HandleViewSource(GURL* url) { if (url->SchemeIs(chrome::kViewSourceScheme)) { // Load the inner URL instead. *url = GURL(url->path()); - *type = TAB_CONTENTS_WEB; return true; } return false; } // Handles URLs for DOM UI. These URLs need no rewriting. -static bool HandleDOMUI(GURL* url, TabContentsType* type) { +static bool HandleDOMUI(GURL* url) { if (!DOMUIFactory::UseDOMUIForURL(*url)) return false; - - *type = TAB_CONTENTS_WEB; return true; } @@ -44,12 +41,11 @@ void BrowserURLHandler::InitURLHandlers() { } // static -bool BrowserURLHandler::HandleBrowserURL(GURL* url, TabContentsType* type) { +void BrowserURLHandler::RewriteURLIfNecessary(GURL* url) { if (url_handlers_.empty()) InitURLHandlers(); for (size_t i = 0; i < url_handlers_.size(); ++i) { - if ((*url_handlers_[i])(url, type)) - return true; + if ((*url_handlers_[i])(url)) + return; } - return false; } |