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

Unified Diff: chrome/browser/ui/webui/options/search_engine_manager_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/search_engine_manager_handler.cc
diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
index 6186269d02026d4feba72cb0cffa959e9295f3e6..806c7f5e407294c98e9861281dbacf9b3d06a1e3 100644
--- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
@@ -39,7 +39,8 @@ SearchEngineManagerHandler::~SearchEngineManagerHandler() {
}
void SearchEngineManagerHandler::Initialize() {
- list_controller_.reset(new KeywordEditorController(web_ui_->GetProfile()));
+ list_controller_.reset(
+ new KeywordEditorController(Profile::FromWebUI(web_ui_)));
if (list_controller_.get()) {
list_controller_->table_model()->SetObserver(this);
OnModelChanged();
@@ -135,7 +136,7 @@ void SearchEngineManagerHandler::OnModelChanged() {
// Build the extension keywords list.
ListValue keyword_list;
ExtensionService* extension_service =
- web_ui_->GetProfile()->GetExtensionService();
+ Profile::FromWebUI(web_ui_)->GetExtensionService();
if (extension_service) {
const ExtensionList* extensions = extension_service->extensions();
for (ExtensionList::const_iterator it = extensions->begin();
@@ -241,8 +242,8 @@ void SearchEngineManagerHandler::EditSearchEngine(const ListValue* args) {
const TemplateURL* edit_url = NULL;
if (index != -1)
edit_url = list_controller_->GetTemplateURL(index);
- edit_controller_.reset(
- new EditSearchEngineController(edit_url, this, web_ui_->GetProfile()));
+ edit_controller_.reset(new EditSearchEngineController(
+ edit_url, this, Profile::FromWebUI(web_ui_)));
}
void SearchEngineManagerHandler::OnEditedKeyword(
« no previous file with comments | « chrome/browser/ui/webui/options/personal_options_handler.cc ('k') | chrome/browser/ui/webui/options/stop_syncing_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698