Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: chrome/browser/browsing_data_remover.cc

Issue 5730004: Rename ExtensionsService to ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/chromeos/login/login_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_remover.h" 5 #include "chrome/browser/browsing_data_remover.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "chrome/browser/autofill/personal_data_manager.h" 11 #include "chrome/browser/autofill/personal_data_manager.h"
12 #include "chrome/browser/browser_thread.h" 12 #include "chrome/browser/browser_thread.h"
13 #include "chrome/browser/download/download_manager.h" 13 #include "chrome/browser/download/download_manager.h"
14 #include "chrome/browser/extensions/extensions_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/history/history.h" 15 #include "chrome/browser/history/history.h"
16 #include "chrome/browser/in_process_webkit/webkit_context.h" 16 #include "chrome/browser/in_process_webkit/webkit_context.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/metrics/user_metrics.h" 18 #include "chrome/browser/metrics/user_metrics.h"
19 #include "chrome/browser/net/chrome_url_request_context.h" 19 #include "chrome/browser/net/chrome_url_request_context.h"
20 #include "chrome/browser/password_manager/password_store.h" 20 #include "chrome/browser/password_manager/password_store.h"
21 #include "chrome/browser/renderer_host/web_cache_manager.h" 21 #include "chrome/browser/renderer_host/web_cache_manager.h"
22 #include "chrome/browser/search_engines/template_url_model.h" 22 #include "chrome/browser/search_engines/template_url_model.h"
23 #include "chrome/browser/sessions/session_service.h" 23 #include "chrome/browser/sessions/session_service.h"
24 #include "chrome/browser/sessions/tab_restore_service.h" 24 #include "chrome/browser/sessions/tab_restore_service.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 BrowsingDataRemover::~BrowsingDataRemover() { 94 BrowsingDataRemover::~BrowsingDataRemover() {
95 DCHECK(all_done()); 95 DCHECK(all_done());
96 } 96 }
97 97
98 void BrowsingDataRemover::Remove(int remove_mask) { 98 void BrowsingDataRemover::Remove(int remove_mask) {
99 DCHECK(!removing_); 99 DCHECK(!removing_);
100 removing_ = true; 100 removing_ = true;
101 101
102 std::vector<GURL> origin_whitelist; 102 std::vector<GURL> origin_whitelist;
103 ExtensionsService* extensions_service = profile_->GetExtensionsService(); 103 ExtensionService* extensions_service = profile_->GetExtensionService();
104 if (extensions_service && extensions_service->HasInstalledExtensions()) { 104 if (extensions_service && extensions_service->HasInstalledExtensions()) {
105 std::map<GURL, int> whitelist_map = 105 std::map<GURL, int> whitelist_map =
106 extensions_service->protected_storage_map(); 106 extensions_service->protected_storage_map();
107 for (std::map<GURL, int>::const_iterator iter = whitelist_map.begin(); 107 for (std::map<GURL, int>::const_iterator iter = whitelist_map.begin();
108 iter != whitelist_map.end(); ++iter) { 108 iter != whitelist_map.end(); ++iter) {
109 origin_whitelist.push_back(iter->first); 109 origin_whitelist.push_back(iter->first);
110 } 110 }
111 } 111 }
112 112
113 std::vector<string16> webkit_db_whitelist; 113 std::vector<string16> webkit_db_whitelist;
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 } 489 }
490 490
491 ChromeAppCacheService* BrowsingDataRemover::GetAppCacheService() { 491 ChromeAppCacheService* BrowsingDataRemover::GetAppCacheService() {
492 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 492 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
493 ChromeURLRequestContext* request_context = 493 ChromeURLRequestContext* request_context =
494 reinterpret_cast<ChromeURLRequestContext*>( 494 reinterpret_cast<ChromeURLRequestContext*>(
495 request_context_getter_->GetURLRequestContext()); 495 request_context_getter_->GetURLRequestContext());
496 return request_context ? request_context->appcache_service() 496 return request_context ? request_context->appcache_service()
497 : NULL; 497 : NULL;
498 } 498 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/chromeos/login/login_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698