diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-15 03:38:29 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-15 03:38:29 +0000 |
| commit | e9a82042b509c4f65d1ed04321ef5daafc5c2dd6 (patch) | |
| tree | 9cb15b9066a04bf4f67b509c76acc5a7a080493a /chrome/browser/history | |
| parent | d454dcbc855465ec505aa99c44128fc3e2bb386b (diff) | |
| download | chromium_src-e9a82042b509c4f65d1ed04321ef5daafc5c2dd6.zip chromium_src-e9a82042b509c4f65d1ed04321ef5daafc5c2dd6.tar.gz chromium_src-e9a82042b509c4f65d1ed04321ef5daafc5c2dd6.tar.bz2 | |
content: Move kHttpScheme constant into content namespace.
BUG=None
TEST=None, no functional change.
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23658056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history')
| -rw-r--r-- | chrome/browser/history/history_backend.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/history/in_memory_url_index.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/history/url_database.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/history/visit_database.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index 21ca31d..3913d1d 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -412,7 +412,7 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { !is_keyword_generated) { const GURL& origin_url(has_redirects ? request.redirects[0] : request.url); - if (origin_url.SchemeIs(chrome::kHttpScheme) || + if (origin_url.SchemeIs(content::kHttpScheme) || origin_url.SchemeIs(content::kHttpsScheme) || origin_url.SchemeIs(chrome::kFtpScheme)) { std::string host(origin_url.host()); diff --git a/chrome/browser/history/in_memory_url_index.cc b/chrome/browser/history/in_memory_url_index.cc index d9b17e2..f859da4 100644 --- a/chrome/browser/history/in_memory_url_index.cc +++ b/chrome/browser/history/in_memory_url_index.cc @@ -43,7 +43,7 @@ void InitializeSchemeWhitelist(std::set<std::string>* whitelist) { whitelist->insert(std::string(chrome::kChromeUIScheme)); whitelist->insert(std::string(chrome::kFileScheme)); whitelist->insert(std::string(chrome::kFtpScheme)); - whitelist->insert(std::string(chrome::kHttpScheme)); + whitelist->insert(std::string(content::kHttpScheme)); whitelist->insert(std::string(content::kHttpsScheme)); whitelist->insert(std::string(content::kMailToScheme)); } diff --git a/chrome/browser/history/url_database.cc b/chrome/browser/history/url_database.cc index e484dd2..1af9f40 100644 --- a/chrome/browser/history/url_database.cc +++ b/chrome/browser/history/url_database.cc @@ -312,7 +312,7 @@ bool URLDatabase::AutocompleteForPrefix(const std::string& prefix, bool URLDatabase::IsTypedHost(const std::string& host) { const char* schemes[] = { - chrome::kHttpScheme, + content::kHttpScheme, content::kHttpsScheme, chrome::kFtpScheme }; diff --git a/chrome/browser/history/visit_database.cc b/chrome/browser/history/visit_database.cc index f758a36..d513efb 100644 --- a/chrome/browser/history/visit_database.cc +++ b/chrome/browser/history/visit_database.cc @@ -491,7 +491,7 @@ bool VisitDatabase::GetRedirectToVisit(VisitID to_visit, bool VisitDatabase::GetVisibleVisitCountToHost(const GURL& url, int* count, base::Time* first_visit) { - if (!url.SchemeIs(chrome::kHttpScheme) && + if (!url.SchemeIs(content::kHttpScheme) && !url.SchemeIs(content::kHttpsScheme)) return false; |