OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/browsing_data_appcache_helper.h" | 9 #include "chrome/browser/browsing_data_appcache_helper.h" |
| 10 #include "chrome/browser/browsing_data_cookie_helper.h" |
10 #include "chrome/browser/browsing_data_database_helper.h" | 11 #include "chrome/browser/browsing_data_database_helper.h" |
11 #include "chrome/browser/browsing_data_file_system_helper.h" | 12 #include "chrome/browser/browsing_data_file_system_helper.h" |
12 #include "chrome/browser/browsing_data_indexed_db_helper.h" | 13 #include "chrome/browser/browsing_data_indexed_db_helper.h" |
13 #include "chrome/browser/browsing_data_local_storage_helper.h" | 14 #include "chrome/browser/browsing_data_local_storage_helper.h" |
14 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/ui/webui/cookies_tree_model_util.h" | 16 #include "chrome/browser/ui/webui/cookies_tree_model_util.h" |
16 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
17 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
18 | 19 |
19 CookiesViewHandler::CookiesViewHandler() : batch_update_(false) { | 20 CookiesViewHandler::CookiesViewHandler() : batch_update_(false) { |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 DCHECK(batch_update_); | 136 DCHECK(batch_update_); |
136 batch_update_ = false; | 137 batch_update_ = false; |
137 | 138 |
138 SendChildren(cookies_tree_model_->GetRoot()); | 139 SendChildren(cookies_tree_model_->GetRoot()); |
139 } | 140 } |
140 | 141 |
141 void CookiesViewHandler::EnsureCookiesTreeModelCreated() { | 142 void CookiesViewHandler::EnsureCookiesTreeModelCreated() { |
142 if (!cookies_tree_model_.get()) { | 143 if (!cookies_tree_model_.get()) { |
143 Profile* profile = web_ui_->GetProfile(); | 144 Profile* profile = web_ui_->GetProfile(); |
144 cookies_tree_model_.reset(new CookiesTreeModel( | 145 cookies_tree_model_.reset(new CookiesTreeModel( |
145 profile->GetRequestContext()->DONTUSEME_GetCookieStore()-> | 146 new BrowsingDataCookieHelper(profile), |
146 GetCookieMonster(), | |
147 new BrowsingDataDatabaseHelper(profile), | 147 new BrowsingDataDatabaseHelper(profile), |
148 new BrowsingDataLocalStorageHelper(profile), | 148 new BrowsingDataLocalStorageHelper(profile), |
149 NULL, | 149 NULL, |
150 new BrowsingDataAppCacheHelper(profile), | 150 new BrowsingDataAppCacheHelper(profile), |
151 BrowsingDataIndexedDBHelper::Create(profile), | 151 BrowsingDataIndexedDBHelper::Create(profile), |
152 BrowsingDataFileSystemHelper::Create(profile), | 152 BrowsingDataFileSystemHelper::Create(profile), |
153 false)); | 153 false)); |
154 cookies_tree_model_->AddCookiesTreeObserver(this); | 154 cookies_tree_model_->AddCookiesTreeObserver(this); |
155 } | 155 } |
156 } | 156 } |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 children); | 205 children); |
206 | 206 |
207 ListValue args; | 207 ListValue args; |
208 args.Append(parent == cookies_tree_model_->GetRoot() ? | 208 args.Append(parent == cookies_tree_model_->GetRoot() ? |
209 Value::CreateNullValue() : | 209 Value::CreateNullValue() : |
210 Value::CreateStringValue(cookies_tree_model_util::GetTreeNodeId(parent))); | 210 Value::CreateStringValue(cookies_tree_model_util::GetTreeNodeId(parent))); |
211 args.Append(children); | 211 args.Append(children); |
212 | 212 |
213 web_ui_->CallJavascriptFunction("CookiesView.loadChildren", args); | 213 web_ui_->CallJavascriptFunction("CookiesView.loadChildren", args); |
214 } | 214 } |
OLD | NEW |