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

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

Issue 7554008: Removal of Profile from content part 6. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Profile helper function, rebase Created 9 years, 4 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
OLDNEW
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_database_helper.h" 10 #include "chrome/browser/browsing_data_database_helper.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 void CookiesViewHandler::TreeModelEndBatch(CookiesTreeModel* model) { 136 void CookiesViewHandler::TreeModelEndBatch(CookiesTreeModel* model) {
137 DCHECK(batch_update_); 137 DCHECK(batch_update_);
138 batch_update_ = false; 138 batch_update_ = false;
139 139
140 SendChildren(cookies_tree_model_->GetRoot()); 140 SendChildren(cookies_tree_model_->GetRoot());
141 } 141 }
142 142
143 void CookiesViewHandler::EnsureCookiesTreeModelCreated() { 143 void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
144 if (!cookies_tree_model_.get()) { 144 if (!cookies_tree_model_.get()) {
145 Profile* profile = web_ui_->GetProfile(); 145 Profile* profile = Profile::FromWebUI(web_ui_);
146 cookies_tree_model_.reset(new CookiesTreeModel( 146 cookies_tree_model_.reset(new CookiesTreeModel(
147 profile->GetRequestContext()->DONTUSEME_GetCookieStore()-> 147 profile->GetRequestContext()->DONTUSEME_GetCookieStore()->
148 GetCookieMonster(), 148 GetCookieMonster(),
149 new BrowsingDataDatabaseHelper(profile), 149 new BrowsingDataDatabaseHelper(profile),
150 new BrowsingDataLocalStorageHelper(profile), 150 new BrowsingDataLocalStorageHelper(profile),
151 NULL, 151 NULL,
152 new BrowsingDataAppCacheHelper(profile), 152 new BrowsingDataAppCacheHelper(profile),
153 BrowsingDataIndexedDBHelper::Create(profile), 153 BrowsingDataIndexedDBHelper::Create(profile),
154 BrowsingDataFileSystemHelper::Create(profile), 154 BrowsingDataFileSystemHelper::Create(profile),
155 BrowsingDataQuotaHelper::Create(profile), 155 BrowsingDataQuotaHelper::Create(profile),
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 children); 208 children);
209 209
210 ListValue args; 210 ListValue args;
211 args.Append(parent == cookies_tree_model_->GetRoot() ? 211 args.Append(parent == cookies_tree_model_->GetRoot() ?
212 Value::CreateNullValue() : 212 Value::CreateNullValue() :
213 Value::CreateStringValue(cookies_tree_model_util::GetTreeNodeId(parent))); 213 Value::CreateStringValue(cookies_tree_model_util::GetTreeNodeId(parent)));
214 args.Append(children); 214 args.Append(children);
215 215
216 web_ui_->CallJavascriptFunction("CookiesView.loadChildren", args); 216 web_ui_->CallJavascriptFunction("CookiesView.loadChildren", args);
217 } 217 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | chrome/browser/ui/webui/options/core_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698