Chromium Code Reviews| Index: chrome/browser/dom_ui/options/options_ui.cc |
| diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc |
| index fcc3b8062e69dbaa1f57eacbbf13eb0e9e86300d..ffd8d78ac73ffff9dfbc54ea85c93a4a5b2ef049 100644 |
| --- a/chrome/browser/dom_ui/options/options_ui.cc |
| +++ b/chrome/browser/dom_ui/options/options_ui.cc |
| @@ -214,8 +214,8 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) { |
| OptionsUI::~OptionsUI() { |
| // Uninitialize all registered handlers. The base class owns them and it will |
| - // eventually delete them. |
| - for (std::vector<DOMMessageHandler*>::iterator iter = handlers_.begin(); |
| + // eventually delete them. Skip over the generic handler. |
|
arv (Not doing code reviews)
2011/01/21 23:07:32
Why?
Evan Stade
2011/01/21 23:41:35
uninitialize is a function of OptionsPageUIHandler
|
| + for (std::vector<DOMMessageHandler*>::iterator iter = handlers_.begin() + 1; |
| iter != handlers_.end(); |
| ++iter) { |
| static_cast<OptionsPageUIHandler*>(*iter)->Uninitialize(); |
| @@ -259,7 +259,8 @@ void OptionsUI::InitializeHandlers() { |
| DCHECK(!GetProfile()->IsOffTheRecord()); |
| std::vector<DOMMessageHandler*>::iterator iter; |
| - for (iter = handlers_.begin(); iter != handlers_.end(); ++iter) { |
| + // Skip over the generic handler. |
| + for (iter = handlers_.begin() + 1; iter != handlers_.end(); ++iter) { |
| (static_cast<OptionsPageUIHandler*>(*iter))->Initialize(); |
| } |
| } |