| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/browsing_data_database_helper.h" | 5 #include "chrome/browser/browsing_data_database_helper.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 origin, name)); | 73 origin, name)); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread() { | 76 void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread() { |
| 77 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); | 77 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
| 78 std::vector<webkit_database::OriginInfo> origins_info; | 78 std::vector<webkit_database::OriginInfo> origins_info; |
| 79 if (tracker_.get() && tracker_->GetAllOriginsInfo(&origins_info)) { | 79 if (tracker_.get() && tracker_->GetAllOriginsInfo(&origins_info)) { |
| 80 for (std::vector<webkit_database::OriginInfo>::const_iterator ori = | 80 for (std::vector<webkit_database::OriginInfo>::const_iterator ori = |
| 81 origins_info.begin(); ori != origins_info.end(); ++ori) { | 81 origins_info.begin(); ori != origins_info.end(); ++ori) { |
| 82 const GURL origin(UTF16ToUTF8(ori->GetOrigin())); | 82 const GURL origin(UTF16ToUTF8(ori->GetOrigin())); |
| 83 if (!BrowsingDataHelper::HasValidScheme(origin)) { | 83 if (!BrowsingDataHelper::HasWebScheme(origin)) { |
| 84 // Non-websafe state is not considered browsing data. | 84 // Non-websafe state is not considered browsing data. |
| 85 continue; | 85 continue; |
| 86 } | 86 } |
| 87 WebSecurityOrigin web_security_origin = | 87 WebSecurityOrigin web_security_origin = |
| 88 WebSecurityOrigin::createFromDatabaseIdentifier( | 88 WebSecurityOrigin::createFromDatabaseIdentifier( |
| 89 ori->GetOrigin()); | 89 ori->GetOrigin()); |
| 90 std::vector<string16> databases; | 90 std::vector<string16> databases; |
| 91 ori->GetAllDatabaseNames(&databases); | 91 ori->GetAllDatabaseNames(&databases); |
| 92 for (std::vector<string16>::const_iterator db = databases.begin(); | 92 for (std::vector<string16>::const_iterator db = databases.begin(); |
| 93 db != databases.end(); ++db) { | 93 db != databases.end(); ++db) { |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 clone->pending_database_info_ = pending_database_info_; | 164 clone->pending_database_info_ = pending_database_info_; |
| 165 return clone; | 165 return clone; |
| 166 } | 166 } |
| 167 | 167 |
| 168 void CannedBrowsingDataDatabaseHelper::AddDatabase( | 168 void CannedBrowsingDataDatabaseHelper::AddDatabase( |
| 169 const GURL& origin, | 169 const GURL& origin, |
| 170 const std::string& name, | 170 const std::string& name, |
| 171 const std::string& description) { | 171 const std::string& description) { |
| 172 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 172 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 173 base::AutoLock auto_lock(lock_); | 173 base::AutoLock auto_lock(lock_); |
| 174 if (BrowsingDataHelper::HasValidScheme(origin)) { | 174 if (BrowsingDataHelper::HasWebScheme(origin)) { |
| 175 pending_database_info_.insert(PendingDatabaseInfo( | 175 pending_database_info_.insert(PendingDatabaseInfo( |
| 176 origin, name, description)); | 176 origin, name, description)); |
| 177 } | 177 } |
| 178 } | 178 } |
| 179 | 179 |
| 180 void CannedBrowsingDataDatabaseHelper::Reset() { | 180 void CannedBrowsingDataDatabaseHelper::Reset() { |
| 181 base::AutoLock auto_lock(lock_); | 181 base::AutoLock auto_lock(lock_); |
| 182 pending_database_info_.clear(); | 182 pending_database_info_.clear(); |
| 183 } | 183 } |
| 184 | 184 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 info->description, | 232 info->description, |
| 233 web_security_origin.toString().utf8(), | 233 web_security_origin.toString().utf8(), |
| 234 0, | 234 0, |
| 235 base::Time())); | 235 base::Time())); |
| 236 } | 236 } |
| 237 | 237 |
| 238 BrowserThread::PostTask( | 238 BrowserThread::PostTask( |
| 239 BrowserThread::UI, FROM_HERE, | 239 BrowserThread::UI, FROM_HERE, |
| 240 base::Bind(&CannedBrowsingDataDatabaseHelper::NotifyInUIThread, this)); | 240 base::Bind(&CannedBrowsingDataDatabaseHelper::NotifyInUIThread, this)); |
| 241 } | 241 } |
| OLD | NEW |