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

Side by Side Diff: chrome_frame/delete_chrome_history.cc

Issue 7717023: Rename REMOVE_COOKIES to REMOVE_SITE_DATA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased onto ToT. Created 9 years, 3 months 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/ui/webui/options/clear_browser_data_handler.cc ('k') | no next file » | 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 // Implementation of DeleteChromeHistory 5 // Implementation of DeleteChromeHistory
6 #include "chrome_frame/delete_chrome_history.h" 6 #include "chrome_frame/delete_chrome_history.h"
7 7
8 #include "chrome/browser/browsing_data_remover.h" 8 #include "chrome/browser/browsing_data_remover.h"
9 9
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 } 73 }
74 if (integrity_level == base::LOW_INTEGRITY) { 74 if (integrity_level == base::LOW_INTEGRITY) {
75 return S_OK; 75 return S_OK;
76 } 76 }
77 if (!InitializeAutomation(GetHostProcessName(false), L"", false, false, 77 if (!InitializeAutomation(GetHostProcessName(false), L"", false, false,
78 GURL(), GURL(), true)) { 78 GURL(), GURL(), true)) {
79 return E_UNEXPECTED; 79 return E_UNEXPECTED;
80 } 80 }
81 81
82 if (flags & DELETE_BROWSING_HISTORY_COOKIES) 82 if (flags & DELETE_BROWSING_HISTORY_COOKIES)
83 remove_mask_ |= BrowsingDataRemover::REMOVE_COOKIES; 83 remove_mask_ |= BrowsingDataRemover::REMOVE_SITE_DATA;
84 if (flags & DELETE_BROWSING_HISTORY_TIF) 84 if (flags & DELETE_BROWSING_HISTORY_TIF)
85 remove_mask_ |= BrowsingDataRemover::REMOVE_CACHE; 85 remove_mask_ |= BrowsingDataRemover::REMOVE_CACHE;
86 if (flags & DELETE_BROWSING_HISTORY_FORMDATA) 86 if (flags & DELETE_BROWSING_HISTORY_FORMDATA)
87 remove_mask_ |= BrowsingDataRemover::REMOVE_FORM_DATA; 87 remove_mask_ |= BrowsingDataRemover::REMOVE_FORM_DATA;
88 if (flags & DELETE_BROWSING_HISTORY_PASSWORDS) 88 if (flags & DELETE_BROWSING_HISTORY_PASSWORDS)
89 remove_mask_ |= BrowsingDataRemover::REMOVE_PASSWORDS; 89 remove_mask_ |= BrowsingDataRemover::REMOVE_PASSWORDS;
90 if (flags & DELETE_BROWSING_HISTORY_HISTORY) 90 if (flags & DELETE_BROWSING_HISTORY_HISTORY)
91 remove_mask_ |= BrowsingDataRemover::REMOVE_HISTORY; 91 remove_mask_ |= BrowsingDataRemover::REMOVE_HISTORY;
92 92
93 loop_.PostDelayedTask(FROM_HERE, 93 loop_.PostDelayedTask(FROM_HERE,
94 new MessageLoop::QuitTask, 1000 * 600); 94 new MessageLoop::QuitTask, 1000 * 600);
95 loop_.MessageLoop::Run(); 95 loop_.MessageLoop::Run();
96 96
97 return S_OK; 97 return S_OK;
98 } 98 }
99 99
100 100
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/clear_browser_data_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698