Index: chrome/browser/extensions/extension_tab_util.cc |
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc |
index 400922144ec68b409456100a7023afd5e221623b..d5feb70183a271e5aec92d7e595b1deb81a163d8 100644 |
--- a/chrome/browser/extensions/extension_tab_util.cc |
+++ b/chrome/browser/extensions/extension_tab_util.cc |
@@ -575,9 +575,10 @@ WindowController* ExtensionTabUtil::GetWindowControllerOfTab( |
return NULL; |
} |
-void ExtensionTabUtil::OpenOptionsPage(const Extension* extension, |
+bool ExtensionTabUtil::OpenOptionsPage(const Extension* extension, |
Browser* browser) { |
- DCHECK(OptionsPageInfo::HasOptionsPage(extension)); |
+ if (!OptionsPageInfo::HasOptionsPage(extension)) |
+ return false; |
// Force the options page to open in non-OTR window, because it won't be |
// able to save settings from OTR. |
@@ -617,6 +618,8 @@ void ExtensionTabUtil::OpenOptionsPage(const Extension* extension, |
browser->tab_strip_model()->GetActiveWebContents(); |
web_contents->GetDelegate()->ActivateContents(web_contents); |
} |
+ |
+ return true; |
} |
} // namespace extensions |