diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 19:01:45 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 19:01:45 +0000 |
| commit | 13ed8da1c7ca2564e5fb9ff624f7cdb80eb033f3 (patch) | |
| tree | 4b52c701627cf62f3e0d5d6b0aa3273303ea523b /chrome/browser/tabs | |
| parent | 1e42f714e94d85e2fcc2ee4eabdb6202291375ad (diff) | |
| download | chromium_src-13ed8da1c7ca2564e5fb9ff624f7cdb80eb033f3.zip chromium_src-13ed8da1c7ca2564e5fb9ff624f7cdb80eb033f3.tar.gz chromium_src-13ed8da1c7ca2564e5fb9ff624f7cdb80eb033f3.tar.bz2 | |
Revert 88142 to fix sync_integration_tests offline.
*Fixup about and chrome scheme URLs in URLFixerUpper::FixupURL.
*Update AboutSource to use the source_name of each about/chrome page.
*Make WillHandleBrowserAboutURL fix up schemes and handle chrome://foo/
-Redirect memory to memory-redirect (wasn't handling chrome://memory/).
-Catalog all kChromeUI*Hosts in url_constants.cc
-Simplify paths (credits, os-credits, ipc, settings, about/version).
-Nix web_ui_util::ChromeURLHostEquals (use scheme & host comparison).
-Favor GURL::SchemeIs and url_constants, update & expand tests.
-Add and fixup chrome://chrome-urls (the about:about page).
BUG=55771
TEST=Access about:, about://, chrome:, chrome:// pages.
Review URL: http://codereview.chromium.org/7068007
TBR=msw@chromium.org
Review URL: http://codereview.chromium.org/7064052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index 8750483..ea3977e 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -22,6 +22,7 @@ #include "chrome/browser/tabs/tab_strip_model_delegate.h" #include "chrome/browser/tabs/tab_strip_model_order_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/webui/web_ui_util.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_process_host.h" @@ -1103,10 +1104,9 @@ std::vector<int> TabStripModel::GetIndicesForCommand(int index) const { bool TabStripModel::IsNewTabAtEndOfTabStrip( TabContentsWrapper* contents) const { const GURL& url = contents->tab_contents()->GetURL(); - return url.SchemeIs(chrome::kChromeUIScheme) && - url.host() == chrome::kChromeUINewTabHost && - contents == GetContentsAt(count() - 1) && - contents->controller().entry_count() == 1; + return web_ui_util::ChromeURLHostEquals(url, chrome::kChromeUINewTabHost) && + contents == GetContentsAt(count() - 1) && + contents->controller().entry_count() == 1; } bool TabStripModel::InternalCloseTabs(const std::vector<int>& in_indices, |