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

Side by Side Diff: chrome/browser/ui/webui/options/cookies_view_handler.cc

Issue 2110483002: Remove use of CanonicalCookie::Source() from browsing_data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge Created 4 years, 5 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
OLDNEW
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/ui/webui/options/cookies_view_handler.h" 5 #include "chrome/browser/ui/webui/options/cookies_view_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 new BrowsingDataDatabaseHelper(profile), 209 new BrowsingDataDatabaseHelper(profile),
210 new BrowsingDataLocalStorageHelper(profile), NULL, 210 new BrowsingDataLocalStorageHelper(profile), NULL,
211 new BrowsingDataAppCacheHelper(profile), 211 new BrowsingDataAppCacheHelper(profile),
212 new BrowsingDataIndexedDBHelper(indexed_db_context), 212 new BrowsingDataIndexedDBHelper(indexed_db_context),
213 BrowsingDataFileSystemHelper::Create(file_system_context), 213 BrowsingDataFileSystemHelper::Create(file_system_context),
214 BrowsingDataQuotaHelper::Create(profile), 214 BrowsingDataQuotaHelper::Create(profile),
215 BrowsingDataChannelIDHelper::Create(profile->GetRequestContext()), 215 BrowsingDataChannelIDHelper::Create(profile->GetRequestContext()),
216 new BrowsingDataServiceWorkerHelper(service_worker_context), 216 new BrowsingDataServiceWorkerHelper(service_worker_context),
217 new BrowsingDataCacheStorageHelper(cache_storage_context), 217 new BrowsingDataCacheStorageHelper(cache_storage_context),
218 BrowsingDataFlashLSOHelper::Create(profile)); 218 BrowsingDataFlashLSOHelper::Create(profile));
219 cookies_tree_model_.reset( 219 cookies_tree_model_.reset(new CookiesTreeModel(
220 new CookiesTreeModel(container, 220 container, profile->GetExtensionSpecialStoragePolicy()));
221 profile->GetExtensionSpecialStoragePolicy(),
222 false));
223 cookies_tree_model_->AddCookiesTreeObserver(this); 221 cookies_tree_model_->AddCookiesTreeObserver(this);
224 } 222 }
225 } 223 }
226 224
227 void CookiesViewHandler::UpdateSearchResults(const base::ListValue* args) { 225 void CookiesViewHandler::UpdateSearchResults(const base::ListValue* args) {
228 base::string16 query; 226 base::string16 query;
229 if (!args->GetString(0, &query)) 227 if (!args->GetString(0, &query))
230 return; 228 return;
231 229
232 EnsureCookiesTreeModelCreated(); 230 EnsureCookiesTreeModelCreated();
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 web_ui()->CallJavascriptFunctionUnsafe("CookiesView.loadChildren", args); 278 web_ui()->CallJavascriptFunctionUnsafe("CookiesView.loadChildren", args);
281 } 279 }
282 280
283 void CookiesViewHandler::ReloadCookies(const base::ListValue* args) { 281 void CookiesViewHandler::ReloadCookies(const base::ListValue* args) {
284 cookies_tree_model_.reset(); 282 cookies_tree_model_.reset();
285 283
286 EnsureCookiesTreeModelCreated(); 284 EnsureCookiesTreeModelCreated();
287 } 285 }
288 286
289 } // namespace options 287 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698